Skip to content

P
patzn-cloud-web-back-soil
Commit 78bd16fe by zhangmengqi
Options

Merge branch 'dev'

parents f87c6d1b 11617162
Showing with 152 additions and 363 deletions
api/soil/soil-test.js
......@@ -157,5 +157,7 @@ export default {
collectFilePage: data =>
http.post('soil/v1/experiment_collect_file/page', data).then(res => res),
pageExpAuditHis: data =>
http.post('soil/v1/entrust/page_exp_audit_his', data).then(res => res)
http.post('soil/v1/entrust/page_exp_audit_his', data).then(res => res),
deleteRecord: data =>
http.delete('soil/v1/original_record/?ids=' + data).then(res => res)
}
components/base/Reason.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" class="zIndex-1100">
<Modal v-model="showModal" v-drag :mask-closable="false" class="zIndex-1100">
<p slot="header">
{{ modalTitle }}
</p>
......
components/operation/Operation.vue
<template>
<div>
<Modal v-model="showModal" width="900" class="modal-footer-none zIndex-1100">
<Modal v-model="showModal" v-drag width="900" class="modal-footer-none zIndex-1100">
<p slot="header">操作日志</p>
<div>
<Row>
......
components/select-equip/SelEquip.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="full-screen zIndex-1200">
<Modal v-model="showModal" v-drag width="100" class="full-screen zIndex-1200">
<div slot="header">设备管理</div>
<div>
<Collapse @on-result-change="_optionResult" left-title="仪器类别" right-title="已选仪器" left-width="15">
......
components/user-info-single/assignPerson.vue
<template>
<div>
<Modal v-model="showUserModal" width="800" :mask-closable="false" class="zIndex-1200">
<Modal v-model="showUserModal" v-drag width="800" :mask-closable="false" class="zIndex-1200">
<p slot="header">{{modalTitle}}</p>
<div>
<Row :gutter="16">
......
pages/meter-entrust/RegisterItemBatchEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false">
<Modal v-model="showModal" v-drag :mask-closable="false">
<p slot="header">填写试验项目信息</p>
<div>
<Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
......
pages/meter-entrust/SoilSampleItemManage.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/meter-entrust/SoilSampleItemManageEdit.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/meter-entrust/SoilSampleItemManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/meter-entrust/SoilSampleManage.vue
<template>
<div>
<Modal v-model="showModal" width="1030" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="1030">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/meter-entrust/SoilSampleManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1010" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="1010" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/meter-entrust/entrust-register/EntrustIndex.vue
......@@ -50,7 +50,6 @@ export default {
this.$nextTick(() => {
this.$refs.refModal._page()
})
// this.$refs.hisTabs._page()
}
}
}
......
pages/meter-entrust/entrust-register/EntrustRegister.vue
......@@ -55,7 +55,6 @@
</template>
<script>
import { soilEntrust } from '../../../api'
import http from '../../../api/http'
import Operation from '../../../components/operation/Operation'
import SoilSampleManage from '../SoilSampleManage'
import importModal from '../../../components/import/DownloadTemplateImport'
......@@ -117,21 +116,11 @@ export default {
id: '',
name: '试验项目列表'
},
// {
// type: 'ios-beaker',
// id: '',
// name: '管理样品'
// },
{
type: 'md-cloud',
id: '',
name: '附件'
},
// {
// type: 'md-document',
// id: '',
// name: '导出委托单'
// },
{
type: 'md-remove-circle',
id: '',
......@@ -210,7 +199,6 @@ export default {
this.$nextTick(() => {
this.$refs.refModal._open(data, '试验委托单导入')
})
// this.$refs.importModal._open(data, '试验委托单导入')
},
_componentResult(msg, data) {
switch (this.currentComponent) {
......@@ -243,9 +231,6 @@ export default {
case '附件':
this._upload(data.id)
break
case '导出委托单':
this._exportEntrust(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
......@@ -262,7 +247,6 @@ export default {
this.$nextTick(() => {
this.$refs.refModal._open(data)
})
// this.$refs.sampleManageModal._open(data)
},
_itemManage(data) {
// 管理样品
......@@ -270,7 +254,6 @@ export default {
this.$nextTick(() => {
this.$refs.refModal._openByEntrustId(data)
})
// this.$refs.itemManageModal._openByEntrustId(data)
},
_submitToReview() {
this._submitByContractIds('委托评审')
......@@ -290,7 +273,6 @@ export default {
})
}
},
_submitByContractIds(cont) {
const ids = this.selectIds
if (ids.length === 0) {
......@@ -312,7 +294,6 @@ export default {
this._resultChange('提交成功')
}
},
_subToSkipRe: async function(ids) {
const result = await soilEntrust.submitSkipReview(ids)
if (result) {
......@@ -329,7 +310,6 @@ export default {
this.$nextTick(() => {
this.$refs.refModal._open(id)
})
// this.$refs.operationModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
......@@ -349,7 +329,6 @@ export default {
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilEntrust.page(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
......@@ -380,32 +359,15 @@ export default {
this.$nextTick(() => {
this.$refs.refModal._open()
})
// this.$refs.editModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.currentComponent = 'FileManage'
this.$nextTick(() => {
this.$refs.refModal._open(id, 'entrustId')
})
// this.$refs.FileManage._open(id, 'entrustId')
},
_exportEntrust(id) {
this.$Modal.confirm({
title: '提示',
content: '确定导出委托单？',
onOk: () => {
http.open('/meter/v1/entrust/export_send_entrust/?id=' + id)
}
})
},
_getById: async function(id) {
const result = await soilEntrust.getVOById(id)
if (result) {
......
pages/meter-entrust/entrust-register/SampleItemEdit.vue
......@@ -9,23 +9,8 @@
title="检测项目管理"
>
<Row>
<Col span="24">
<Form v-model="formObj" :label-width="90" inline onsubmit="return false">
<Form-item class="search-item" label="试验名称:" style="margin-left: -25px">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable />
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">
搜索
</Button>
</Form-item>
</Form>
</Col>
<!--正常界面-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" />
</Col>
<Col span="24">
<PTVXETable ref="pageTable" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
......@@ -119,19 +104,25 @@ export default {
itemList: {
records: []
},
getPage: {},
getPage: {
records: []
},
selectData: [],
originalList: []
}
},
methods: {
_open(id) {
_open(expList) {
this.formObj = this.$resetFields(this.formObj)
this.showModal = true
this.formObj.sampleId = id
this.$refs.pageTable._hideLoading()
this.getPage.records = expList
this.selectData = []
console.log(expList)
this.$refs.pageTable._clearSelection()
// this.formObj.sampleId = id
// this.$refs.pageTable._hideLoading()
// if (catalogueId) {
this._page()
// this._page()
// }
},
_handleRow(scope) {
......@@ -151,7 +142,7 @@ export default {
this._cancel()
break
case '保存':
this._ok()
this._saveCatalogueItem()
break
}
},
......@@ -178,25 +169,30 @@ export default {
_iconClick(res, data) {
switch (res) {
case '删除':
this._deleteById(data.id)
this._deleteById(data.id, data.index)
break
}
},
// 删除
_deleteById(id) {
_deleteById(id, index) {
this.$Modal.confirm({
title: '提示',
content: '确定删除该数据？',
onOk: () => {
this._deleteOk(id)
this._deleteOk(id, index)
}
})
},
_deleteOk: async function(id) {
_deleteOk: async function(id, index) {
if (id) {
const result = await soilEntrust.experimentDeleteById(id)
if (result) {
this.$Message.success('删除成功')
this._page()
this.getPage.records.splice(index, 1)
}
} else {
this.$Message.success('成功删除')
this.getPage.records.splice(index, 1)
}
},
// table结果 返回整行
......@@ -222,12 +218,14 @@ export default {
},
_saveCatalogueItem(data) {
this.showModal = false
this.$emit('on-result-change', data)
this.$emit('on-result-change', this.getPage.records)
this._hideLoading()
console.log(this.getPage.records)
},
_cancel() {
this.selectData = []
this.showModal = false
this.$emit('on-result-change', this.getPage.records)
},
_visibleChange() {
const data = this.itemList.records
......
pages/meter-entrust/entrust-review/EntrustDetail.vue
<template>
<div>
<Modal v-model="showDetailModal" :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">
<table class="tableClass">
<tbody>
......@@ -39,10 +39,6 @@ export default {
data() {
return {
obj: {
// detail: {},
// customer: {},
// finance: {},
// tested: {}
firsted: 0,
client: '',
boreholeLocation: '',
......@@ -52,7 +48,6 @@ export default {
testType: ''
},
showDetailModal: false,
// sampleType:['退样','留样','作废'],
dispose: '',
height: '',
showMoney: false
......@@ -62,13 +57,6 @@ export default {
_open(obj, flag) {
this.showDetailModal = true
this.obj = obj
console.log('传过来的数据')
console.log(this.obj)
// if(obj.dispose !== undefined || ''){
// this.dispose = this.sampleType[obj.dispose];
// }else{
// this.dispose = '';
// }
if (flag === 'showMoney') {
this.showMoney = true
} else {
......
pages/meter-entrust/entrust-review/ReviewEntrust.vue
......@@ -143,19 +143,6 @@ export default {
_detailModal(data) {
console.log(data)
this.$refs.sampleEdit._open(data)
// 查看
// this.$store.dispatch('FoodContract/getById', data.id).then(() => {
// if (data.type === 0) {
// // 企业委托 ’0‘
// this.currentComponent = 'FoodContractCompanyDetail'
// } else {
// // 政府委托 ’1‘
// this.currentComponent = 'FoodContractGovernDetail'
// }
// this.$nextTick(() => {
// this.$refs.refModal._open(this.$store.state.FoodContract.model)
// })
// })
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
......
pages/soil-sample-manage/SoilSampleItemManage.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-sample-manage/SoilSampleItemManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-sample-manage/SoilSampleManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1180" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="1180" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......@@ -28,7 +28,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" select-data is-edit @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -37,14 +37,18 @@
:width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined"
:edit-render="item.editCell?{autofocus: 'input'}:null" sortable>
<template slot-scope="scope">
<template v-slot:edit="scope">
<div v-if="item.key==='describeDetail'" @click.stop="_handleRow(scope)">
<!-- <el-input v-model="scope.row.describeDetail" @change="_inputChange(scope.row)" placeholder="请输入土质描述详情">-->
<!-- </el-input>-->
<Input :value="scope.row.describeDetail" @change.native="_inputChange($event.target.value,scope.row)"></Input>
</div>
<div v-else-if="item.key==='remark'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.remark" @change="_remarkChange(scope.row)"></el-input>
</div>
<div v-else>
</template>
<template slot-scope="scope">
<div v-if>
{{ scope.row[item.key] }}
</div>
</template>
......
pages/soil-sample-manage/backups-manage/SampleParpareApply.vue
<template>
<div>
<Modal v-model="showModalHandleApply" :mask-closable="false" width="500">
<Modal v-model="showModalHandleApply" v-drag :mask-closable="false" width="500">
<p slot="header">处理申请</p>
<div>
<Form ref="formObj" :id="formId" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
......
pages/soil-sample-manage/backups-manage/SampleParpareBatchEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false">
<Modal v-model="showModal" v-drag :mask-closable="false">
<p slot="header">填写存放信息</p>
<div>
<Form id="storage-location-form" ref="formObj" :model="formObj" :label-width="100">
......
pages/soil-sample-manage/sample-address/AddressManageEdit.vue
<template>
<div>
<Modal v-model="showEditModal" :mask-closable="false" :width="500" class="zIndex-1200">
<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>
......
pages/soil-sample-manage/sample-address/ViewLocationEntrust.vue
<template>
<div>
<Modal v-model="showModal" width="1030" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="1030" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-sample-manage/sample-address/ViewSample.vue
<template>
<div>
<Modal v-model="showModal" width="980" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="980" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-sample-manage/sample-preparation/CollectFileManage.vue
<template>
<div>
<Modal v-model="showModal" width="800" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="800" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......@@ -77,7 +77,7 @@ export default {
this.aptitudeItemInfo = data
this.formObj = this.$resetFields(this.formObj)
this.id = data.id
this.modalTitle = data.name + ' 查看采集数据'
this.modalTitle = data.name + ' 查看采集文件'
this.showModal = true
this._page()
},
......
pages/soil-sample-manage/sample-preparation/CollectManage.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="100" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-sample-manage/sample-preparation/DescribeDetailModal.vue
<template>
<div>
<Modal v-model="showEditModal" :mask-closable="false" :width="500" class="zIndex-1200">
<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>
......
pages/soil-sample-manage/sample-preparation/EquipManage.vue
<template>
<div>
<Modal v-model="showModal" width="800" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="800" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-sample-manage/sample-preparation/ImportItem.vue
<!--Collapse关联框 单个导入项目-->
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="100" class="zIndex-1200 full-screen modal-header-none">
<Modal v-model="showModal" v-drag :mask-closable="false" width="100" class="zIndex-1200 full-screen modal-header-none">
<p slot="header">
导入检测项目
</p>
<div>
<Collapse :right-title="'已选的检测项目 (共'+getPage.records.length+'条)'" @on-result-change="_optionResult"
:left-width="18"
......
pages/soil-sample-manage/sample-preparation/IndexManage.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="100" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-sample-manage/sample-preparation/IndexManageEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" @on-visible-change="_visibleChange" width="900">
<Modal v-model="showModal" v-drag :mask-closable="false" @on-visible-change="_visibleChange" width="900">
<p slot="header">{{modalTitle}}</p>
<div>
<Form ref="formObj" :id="formId" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
......
pages/soil-sample-manage/sample-preparation/PreparationHis.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="90" class="zIndex-1000 full-screen">
<Modal v-model="showModal" v-drag :mask-closable="false" width="90" class="zIndex-1000 full-screen">
<p slot="header">制备详情</p>
<Row>
<!--操作-->
......
pages/soil-sample-manage/sample-preparation/PrepareItemBatchEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false">
<Modal v-model="showModal" v-drag :mask-closable="false">
<p slot="header">填写试验项目信息</p>
<div>
<Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
......
pages/soil-sample-manage/sample-preparation/SampleManage.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1200"
class="zIndex-900 modal-footer-none">
<p slot="header">管理样品</p>
<div>
......
pages/soil-sample-manage/sample-preparation/SampleParpareBatchEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false">
<Modal v-model="showModal" v-drag :mask-closable="false">
<p slot="header">填写制备信息</p>
<div>
<Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
......
pages/soil-sample-manage/sample-preparation/SoilItemNum.vue
<template>
<div>
<Modal v-model="showModal" width="800">
<Modal v-model="showModal" v-drag width="800">
<p slot="header">
{{ modalTitle }}
</p>
......@@ -11,9 +11,6 @@
<Col span="24">
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" class="contHide" show-search-btn="true" @on-result-change="_btnClick"></btn-list>
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
......
pages/soil-sample-manage/sample-preparation/SoilSampleItemManageEdit.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-sample-manage/sample-receive/SampleReceiveModal.vue
<template>
<div>
<Modal v-model="showEditModal" :mask-closable="false" :width="500" class="zIndex-1200">
<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>
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManage.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1100"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1100"
class="zIndex-900 modal-footer-none">
<p slot="header"> {{name}}--管理样品</p>
<div>
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManageHis.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1100"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1100"
class="zIndex-900 modal-footer-none">
<p slot="header"> {{name}}--管理样品</p>
<div>
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/SoilSampleItemManage.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue
......@@ -15,6 +15,9 @@
<Option v-for="(item,index) in itemData" :value="item.value" :key="index">{{item.name}}</Option>
</Select>
</Form-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">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
......
pages/soil-sample-manage/sample-take/ItemManage.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="100" class="modal-footer-none full-screen">
<p slot="header">{{modalTitle}}</p>
<div>
<!--内容-->
......
pages/soil-sample-manage/sample-take/TakeSampleManage.vue
<template>
<div>
<Modal v-model="showSampleModal" width="1100"
<Modal v-model="showSampleModal" v-drag width="1100"
class="zIndex-900 modal-footer-none" @on-visible-change="_visibleChange">
<p slot="header">
管理样品
</p>
<div>
<!--内容-->
<Row>
......
pages/soil-sample-manage/surplus-manage/SampleSurplusBatchEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false">
<Modal v-model="showModal" v-drag :mask-closable="false">
<p slot="header">填写存放信息</p>
<div>
<Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
......
pages/soil-sample-manage/surplus-manage/SurplusParpareApply.vue
<template>
<div>
<Modal v-model="showModalHandleApply" :mask-closable="false" width="500">
<Modal v-model="showModalHandleApply" v-drag :mask-closable="false" width="500">
<p slot="header">处理申请</p>
<div>
<Form ref="formObj" :id="formId" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
......
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
......@@ -8,11 +8,8 @@
<Col span="24">
<Form id="search-form" :label-width="80" 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.entrustCode" name="entrustCode" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品名称" clearable/>
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-data-audit/AuditDataModal.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1200"
class="zIndex-900 modal-footer-none">
<p slot="header">数据审核</p>
<div>
......
pages/soil-test-manage/test-data-audit/EquipManage.vue
<template>
<div>
<Modal v-model="showModal" width="800" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="800" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-data-audit/IndexManage.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="100" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-data-audit/SoilSampleItemManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-data-audit/SoilSampleManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="960" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="960" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-data-audit/item-tabs/ItemRightList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="检测项目:">
<Input @on-enter="_formSearch" name="name" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-data-audit/sample-tabs/SampleLeftList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-sample-left" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试样编号:">
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-data-audit/sample-tabs/SampleRightList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-sample-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试验名称:">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-data-check/CheckDataModal.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1200"
class="zIndex-900 modal-footer-none">
<p slot="header">数据复核</p>
<div>
......
pages/soil-test-manage/test-data-check/EquipManage.vue
<template>
<div>
<Modal v-model="showModal" width="800" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="800" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-data-check/IndexManage.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="100" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-data-check/SoilSampleItemManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-data-check/SoilSampleManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="960" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="960" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-data-check/item-tabs/ItemRightList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="检测项目:">
<Input @on-enter="_formSearch" name="name" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-data-check/sample-tabs/SampleLeftList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-sample-left" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试样编号:">
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-data-check/sample-tabs/SampleRightList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-sample-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试验名称:">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-data-consult/SoilSampleItemManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-data-consult/SoilSampleManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="960" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="960" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-input/CollectFileManage.vue
<template>
<div>
<Modal v-model="showModal" width="800" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="800" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-input/CollectManage.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="100" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-input/EquipManage.vue
<template>
<div>
<Modal v-model="showModal" width="800" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="800" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-input/IndexManage.vue
<template>
<div>
<Modal v-model="showModal" width="100" class="modal-footer-none full-screen">
<Modal v-model="showModal" v-drag width="100" class="modal-footer-none full-screen">
<div slot="header">{{modalTitle}}</div>
<div>
<Form id="index-right-form" :label-width="80" inline onsubmit="return false">
......
pages/soil-test-manage/test-input/IndexManageEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" @on-visible-change="_visibleChange" width="900">
<Modal v-model="showModal" v-drag :mask-closable="false" @on-visible-change="_visibleChange" width="900">
<p slot="header">{{modalTitle}}</p>
<div>
<Form ref="formObj" :id="formId" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
......
pages/soil-test-manage/test-input/ItemView.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......@@ -11,11 +11,8 @@
<Col span="24">
<Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<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.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
<Form-item label="试验名称:" class="search-item">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable />
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">
......
pages/soil-test-manage/test-input/OriginalRecordView.vue
......@@ -6,10 +6,10 @@
<Form :label-width="80" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="模板名称:">
<Input v-model="formObj.templateTitle" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input>
<Input v-model="formObj.title" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input>
</Form-item>
<Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.cusNames" @on-enter="_formSearch" placeholder="请输入委托单位" clearable></Input>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -39,18 +39,6 @@
<div v-else>{{scope.row[item.key]}}</div>
</template>
</vxe-table-column>
<!-- <template slot="col">-->
<!-- <vxe-table-column-->
<!-- :width="190"-->
<!-- title="操作"-->
<!-- align="center"-->
<!-- fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <VXEIconList :msg="(scope.row.hasInputItem===1) ? iconMsg : iconMsgDisable"-->
<!-- @on-result-change="_iconClick" :rowData="scope.row"></VXEIconList>-->
<!-- </template>-->
<!-- </vxe-table-column>-->
<!-- </template>-->
</PTVXETable>
</Col>
</Row>
......@@ -76,16 +64,7 @@ export default {
return {
currentComponent: '',
getPage: {},
btn: [
{
type: '',
id: '',
name: '纠正填写时间',
componentName: 'EditDateModal'
},
{ type: '', id: '', name: '设置填写人乙' },
{ type: 'error', id: '', name: '删除' }
],
btn: [],
selectIds: [],
iconMsg: [
{
......@@ -102,55 +81,8 @@ export default {
type: 'ios-list',
id: '',
name: '查看试验项目'
}
// {
// type: 'erlenmeyer-flask',
// id: '',
// name: '查看样品',
// componentName: 'SampleView'
// },
// {
// type: 'document-text',
// id: '',
// name: '查看检测项目',
// componentName: 'ItemView'
// },
// { type: 'cloud', id: '', name: '附件', componentName: 'FileManage' },
// { type: 'trash-a', id: '', name: '删除' },
// {
// type: 'ios-clock',
// id: '',
// name: '操作记录',
// componentName: 'ElnFormRecord'
// }
],
iconMsgDisable: [
{ type: 'md-create', id: '', name: '编辑', disabled: true },
{
type: '',
id: '',
name: '查看原始记录',
componentName: 'OriginalItemView'
},
{
type: 'ios-list',
id: '',
name: '查看试验项目'
}
// {
// type: 'document-text',
// id: '',
// name: '查看检测项目',
// componentName: 'ItemView'
// },
// { type: 'cloud', id: '', name: '附件', componentName: 'FileManage' },
// { type: 'trash-a', id: '', name: '删除', disabled: true },
// {
// type: 'ios-clock',
// id: '',
// name: '操作记录',
// componentName: 'ElnFormRecord'
// }
{ type: 'md-trash', id: '', name: '删除' }
],
pageColumns: [
{ title: '模板名称', key: 'title' },
......@@ -159,16 +91,7 @@ export default {
{ title: '创建时间', key: 'ctime', dateTime: true }
],
formObj: {
entrustId: '',
batchNos: '',
sampleNums: '',
templateTitle: '',
fillInTimeBegin: '',
fillInTimeEnd: '',
cusNames: '',
codes: '',
itemNames: '',
testAccordings: ''
entrustId: ''
},
searchOpen: false
}
......@@ -212,40 +135,12 @@ export default {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '纠正填写时间':
this._editWriteTime()
break
case '设置填写人乙':
this._setAnotherTester()
break
case '删除':
this._batchDelete()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
// 设置填写人乙
_setAnotherTester() {
if (this.selectIds.length === 0) {
this.$msgTip('warning')
} else {
this.$refs.testerModal._open(this.selectIds)
}
},
_editWriteTime() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据')
} else {
this.$refs.refModal._open('填写时间')
}
},
_dateChange(data) {
this.formObj.fillInTimeBegin = data[0]
this.formObj.fillInTimeEnd = data[1]
},
_iconClick(res, data, currentComponent) {
this.currentComponent = currentComponent
this.$nextTick(() => {
......@@ -262,21 +157,9 @@ export default {
case '查看试验项目':
this._itemView(data.id)
break
case '查看检测项目':
this.$refs.refModal._open(data)
break
case '查看样品':
this.$refs.refModal._open(data.id)
break
case '附件':
this.$refs.refModal._open(data.id, 'originalId')
break
case '删除':
this._deleteByIds([data.id])
break
case '操作记录':
this.$refs.refModal._open(data.id)
break
}
})
},
......@@ -286,7 +169,6 @@ export default {
},
// 查看原始记录
_recordView(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
......@@ -343,28 +225,22 @@ export default {
this.getPage = result
}
},
// 批量删除原始记录
_batchDelete() {
if (this.selectIds.length > 0) {
const content = '确定删除这' + this.selectIds.length + '条数据？'
this._deleteByIds(this.selectIds, content)
} else {
this.$msgTip('warning')
}
},
// 删除原始记录
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this.$store.dispatch('EnvItem/deleteOriRecord', ids).then(() => {
if (this.$store.state.EnvItem.success) {
this._page()
this.$Message.success('删除成功!')
this._deleteOk(ids)
}
})
},
_deleteOk: async function(ids) {
const result = await soilTest.deleteRecord(ids)
if (result) {
this.$Message.success('删除成功')
this._page()
}
})
}
}
}
......
pages/soil-test-manage/test-input/SampleManage.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1200"
class="zIndex-900 modal-footer-none">
<p slot="header"> {{name}}--管理样品</p>
<div>
......
pages/soil-test-manage/test-input/SoilSampleItemManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="1200">
<Modal v-model="showModal" v-drag width="1200">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-input/SoilSampleManageHis.vue
<template>
<div>
<Modal v-model="showModal" width="960" class="modal-footer-none">
<Modal v-model="showModal" v-drag width="960" class="modal-footer-none">
<p slot="header">
{{ modalTitle }}
</p>
......
pages/soil-test-manage/test-input/TestInput.vue
......@@ -9,10 +9,10 @@
<Form id="search-form" :label-width="70" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托商:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入委托商" clearable></Input>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托单位" clearable></Input>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="检测项目:">
<Input @on-enter="_formSearch" name="name" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue
......@@ -5,8 +5,11 @@
<Col span="24">
<Form id="task-assign-sample-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试验项目:">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验项目" clearable></Input>
</Form-item>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/SampleManage.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1200"
class="zIndex-900 modal-footer-none">
<p slot="header"> {{name}}--管理样品</p>
<div>
......
pages/soil-test-manage/test-task-manage/AllotByEntrust.vue
......@@ -65,11 +65,6 @@
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
<!-- <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
</div>
</template>
<script>
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/SampleManage.vue
<template>
<div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
<Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1200"
class="zIndex-900 modal-footer-none">
<p slot="header"> {{name}}--管理样品</p>
<div>
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemRightList.vue
......@@ -424,37 +424,6 @@ export default {
const user = Global.getUserInfo('userInfo')
console.log(user)
this.$refs.personModal._openGoup('分配人员', 'itemTree')
// if (this.defaultPlanDate) {
// // 有字典
// if (this.sampleNames === '') {
// // 有计划完成时间
// const user = Global.getUserInfo('userInfo')
// this.currentComponent = 'AssignPerson'
// this.$nextTick(function() {
// this.$refs.refModal._openGoupByUserId(
// '分配人员',
// user.id,
// 'itemTree'
// )
// })
// } else {
// // 有字典，无计划完成时间的
// this.$Modal.confirm({
// title: '提示',
// content:
// '所选项目中含有未设置计划完成时间的' +
// `${this._reportDueDate()}` +
// '请确认！',
// onOk: () => {}
// })
// }
// } else {
// // 无字典
// this.currentComponent = 'EndDateModal'
// this.$nextTick(() => {
// this._endDate()
// })
// }
},
// 遍历出计划时间为空的样品名
_reportDueDate() {
......
router/soil-routes.js
......@@ -42,6 +42,7 @@ export default [
{
path: 'entrust',
component: Blank,
meta: { title: '委托单管理' },
children: [
{
path: 'entrust_register',
......@@ -58,6 +59,7 @@ export default [
{
path: 'sample',
component: Blank,
meta: { title: '试样管理' },
children: [
{
path: 'receive',
......@@ -114,6 +116,7 @@ export default [
{
path: 'test',
component: Blank,
meta: { title: '检测管理' },
children: [
{
path: 'allot_task',
......@@ -145,6 +148,7 @@ export default [
{
path: 'report',
component: Blank,
meta: { title: '报告管理' },
children: [
{
path: 'make_report',
......@@ -171,6 +175,7 @@ export default [
{
path: 'aptitude',
component: Blank,
meta: { title: '资质管理' },
children: [
{
path: 'test_basis',
......@@ -187,6 +192,7 @@ export default [
{
path: 'statistics',
component: Blank,
meta: { title: '统计查询' },
children: [
{
path: 'fail_item_statistics',
......
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