Commit 374407ab by wangweidong

土工试验Lims

parent 857b14ce
...@@ -172,18 +172,7 @@ export default { ...@@ -172,18 +172,7 @@ export default {
this.$Message.warning('暂无图片!') this.$Message.warning('暂无图片!')
} }
}, },
_uploadPic(id) {
const action = '/meter/v1/aptitude/upload_?aptitudeId=' + id
const data = {
importUrl: action,
downloadUrl: '',
title: '上传'
}
this.$refs.imageTemplateImport._open(data, '上传图片')
},
_page: async function() { _page: async function() {
// this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilAptitude.page(this.formObj) const result = await soilAptitude.page(this.formObj)
if (result) { if (result) {
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
<div> <div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="95" inline class="inputBox"> <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="95" inline class="inputBox">
<Form-item label="类别" prop="classType" style="width: 100%"> <Form-item label="类别" prop="classType" style="width: 100%">
<!-- <Input v-model="formObj.classType" @on-keyup="_onKeyUp" name="classType" placeholder="请选择类别" icon="plus-circled"-->
<!-- ></Input>-->
<el-select v-model="formObj.classType" placeholder="请选择类别" size="small" clearable> <el-select v-model="formObj.classType" placeholder="请选择类别" size="small" clearable>
<el-option :label="item.value" :value="item.value" v-for="(item,index) in typeList" <el-option :label="item.value" :value="item.value" v-for="(item,index) in typeList"
:key="index"></el-option> :key="index"></el-option>
...@@ -185,21 +183,6 @@ export default { ...@@ -185,21 +183,6 @@ export default {
} }
}, },
methods: { methods: {
_onKeyUp() {
if (this.formObj.alias === '' || this.formObj.classType === '') {
this.isDisable = true
} else {
this.isDisable = false
this.action =
global.baseURL +
'/meter/v1/file_template/upload_template/?classType=' +
this.formObj.classType +
'&alias=' +
this.formObj.alias +
'&remark=' +
this.formObj.remark
}
},
channelInputLimit(e) { channelInputLimit(e) {
const key = e.key const key = e.key
// 不允许输入'e'和'.' // 不允许输入'e'和'.'
...@@ -258,18 +241,6 @@ export default { ...@@ -258,18 +241,6 @@ export default {
_handelprogress(event, file, fileList) { _handelprogress(event, file, fileList) {
this.isLoad = true this.isLoad = true
}, },
// _handelsuccess(response, file, fileList) {
// // 上传成功
// if (response.success) {
// this.isLoad = false
// this.$Message.success('上传成功!')
// this.$emit('on-result-change')
// this.showEditModal = false
// } else {
// this.isLoad = true
// this.$Message.error(response.msg)
// }
// },
_formatError(file) { _formatError(file) {
this.$Notice.error({ this.$Notice.error({
title: '文件格式不正确', title: '文件格式不正确',
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
<div> <div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="95" inline class="inputBox"> <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="95" inline class="inputBox">
<Form-item label="类别" prop="classType" style="width: 100%"> <Form-item label="类别" prop="classType" style="width: 100%">
<!-- <Input v-model="formObj.classType" @on-keyup="_onKeyUp" name="classType" placeholder="请选择类别" icon="plus-circled"-->
<!-- ></Input>-->
<el-select v-model="formObj.classType" placeholder="请选择类别" size="small" clearable> <el-select v-model="formObj.classType" placeholder="请选择类别" size="small" clearable>
<el-option :label="item.value" :value="item.value" v-for="(item,index) in typeList" <el-option :label="item.value" :value="item.value" v-for="(item,index) in typeList"
:key="index"></el-option> :key="index"></el-option>
...@@ -204,21 +202,6 @@ export default { ...@@ -204,21 +202,6 @@ export default {
} }
}, },
methods: { methods: {
_onKeyUp() {
if (this.formObj.alias === '' || this.formObj.classType === '') {
this.isDisable = true
} else {
this.isDisable = false
this.action =
global.baseURL +
'/meter/v1/file_template/upload_template/?classType=' +
this.formObj.classType +
'&alias=' +
this.formObj.alias +
'&remark=' +
this.formObj.remark
}
},
channelInputLimit(e) { channelInputLimit(e) {
const key = e.key const key = e.key
// 不允许输入'e'和'.' // 不允许输入'e'和'.'
......
...@@ -152,21 +152,6 @@ export default { ...@@ -152,21 +152,6 @@ export default {
} }
}, },
methods: { methods: {
_onKeyUp() {
if (this.formObj.alias === '' || this.formObj.classType === '') {
this.isDisable = true
} else {
this.isDisable = false
this.action =
global.baseURL +
'/meter/v1/file_template/upload_template/?classType=' +
this.formObj.classType +
'&alias=' +
this.formObj.alias +
'&remark=' +
this.formObj.remark
}
},
channelInputLimit(e) { channelInputLimit(e) {
const key = e.key const key = e.key
// 不允许输入'e'和'.' // 不允许输入'e'和'.'
......
...@@ -150,21 +150,6 @@ export default { ...@@ -150,21 +150,6 @@ export default {
} }
}, },
methods: { methods: {
_onKeyUp() {
if (this.formObj.alias === '' || this.formObj.classType === '') {
this.isDisable = true
} else {
this.isDisable = false
this.action =
global.baseURL +
'/meter/v1/file_template/upload_template/?classType=' +
this.formObj.classType +
'&alias=' +
this.formObj.alias +
'&remark=' +
this.formObj.remark
}
},
channelInputLimit(e) { channelInputLimit(e) {
const key = e.key const key = e.key
// 不允许输入'e'和'.' // 不允许输入'e'和'.'
......
...@@ -185,21 +185,6 @@ export default { ...@@ -185,21 +185,6 @@ export default {
} }
}, },
methods: { methods: {
_onKeyUp() {
if (this.formObj.alias === '' || this.formObj.classType === '') {
this.isDisable = true
} else {
this.isDisable = false
this.action =
global.baseURL +
'/meter/v1/file_template/upload_template/?classType=' +
this.formObj.classType +
'&alias=' +
this.formObj.alias +
'&remark=' +
this.formObj.remark
}
},
channelInputLimit(e) { channelInputLimit(e) {
const key = e.key const key = e.key
// 不允许输入'e'和'.' // 不允许输入'e'和'.'
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
</template> </template>
<script> <script>
import { soilEntrust } from '../../../api' import { soilEntrust } from '../../../api'
import http from '../../../api/http'
import Operation from '../../../components/operation/Operation' import Operation from '../../../components/operation/Operation'
import global from '../../../api/config' import global from '../../../api/config'
import SampleManage from './SampleManage' import SampleManage from './SampleManage'
...@@ -117,12 +116,8 @@ export default { ...@@ -117,12 +116,8 @@ export default {
{ title: '水深(米)', key: 'waterDepth', width: 120 }, { title: '水深(米)', key: 'waterDepth', width: 120 },
{ title: '钻孔名称', key: 'boreholeName', width: 120 }, { title: '钻孔名称', key: 'boreholeName', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true }, { title: '进度', key: 'progress', width: 120, status: true },
// { title: '平均容重', key: 'projectNo', width: 120 },
// { title: '报告编号', key: 'reportCode', width: 120 },
{ title: '制表日期', key: 'tabulateDate', width: 120, date: true }, { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
{ title: '制表人', key: 'tabulater', width: 120 }, { title: '制表人', key: 'tabulater', width: 120 },
// { title: '批准日期', key: 'approveDate', width: 120, date: true },
// { title: '批准人', key: 'approver', width: 120 },
{ title: '检验类别', key: 'testType', width: 120 } { title: '检验类别', key: 'testType', width: 120 }
] ]
} }
...@@ -178,9 +173,6 @@ export default { ...@@ -178,9 +173,6 @@ export default {
case '附件': case '附件':
this._upload(data.id) this._upload(data.id)
break break
case '导出委托单':
this._exportEntrust(data.id)
break
case '删除': case '删除':
this._deleteByIds([data.id]) this._deleteByIds([data.id])
break break
...@@ -340,16 +332,6 @@ export default { ...@@ -340,16 +332,6 @@ export default {
}) })
// this.$refs.FileManage._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) { _getById: async function(id) {
const result = await soilEntrust.getVOById(id) const result = await soilEntrust.getVOById(id)
if (result) { if (result) {
......
...@@ -58,11 +58,6 @@ ...@@ -58,11 +58,6 @@
sortable sortable
> >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <div v-if="item.key==='sampleCode'" @click.stop="_handleRow(scope)">-->
<!-- <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" style="width: 150px;"-->
<!-- ></el-input>-->
<!-- <a @on-result-change="_judgeBasisChange" @click="_selectjudgeBasis(scope.$rowIndex)" style="font-size: 18px;" class="">+</a>-->
<!-- </div>-->
<div v-if="item.key==='siteNo'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='siteNo'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.siteNo" blur placeholder="请输入现场编号" <el-input v-model="scope.row.siteNo" blur placeholder="请输入现场编号"
></el-input> ></el-input>
...@@ -346,9 +341,6 @@ export default { ...@@ -346,9 +341,6 @@ export default {
case '导入试验项目': case '导入试验项目':
this._importItem() this._importItem()
break break
case '导入':
this._importSample()
break
case 'search': case 'search':
this.searchOpen = !this.searchOpen this.searchOpen = !this.searchOpen
break break
...@@ -402,47 +394,6 @@ export default { ...@@ -402,47 +394,6 @@ export default {
_tabulateChange(data) { _tabulateChange(data) {
this.formObj.tabulateDate = data this.formObj.tabulateDate = data
}, },
_odateChange(data) {
this.formObj.odate = data
},
_judgeBasisChange(msg, data) {
switch (msg) {
case 'select':
this.formObj.stdId = data.id
this.formObj.code = data.stdNum
this.formObj.name = data.name
this.$refs.formObj.validateField('code')
break
case 'query':
this.formObj.stdId = ''
this.formObj.code = data.stdNum
this.formObj.name = ''
this._getJudgeBasisList(data.stdNum)
break
case 'focus':
this._getJudgeBasisList()
break
case 'blur':
if (this.formObj.stdId === '') {
this.formObj.code = ''
this._getJudgeBasisList()
}
this.$refs.formObj.validateField('code')
}
},
_selectjudgeBasis(index) {
console.log(index)
this.index = index
this.$refs.EditModal._open()
},
_selectverification(index) {
console.log(index)
this.index = index
this.$refs.VerificationModal._open()
},
_selectcontractCode() {
this.$refs.ContractModal._open()
},
_backData(data) { _backData(data) {
this.$forceUpdate() this.$forceUpdate()
console.log(typeof this.index) console.log(typeof this.index)
...@@ -455,28 +406,6 @@ export default { ...@@ -455,28 +406,6 @@ export default {
console.log('返回的数据', data) console.log('返回的数据', data)
console.log(this.getPage.records) console.log(this.getPage.records)
}, },
_backContract(data) {
this.formObj.client = data.client
this.formObj.operation.person = data.person
this.formObj.operation.tel = data.tel
this.formObj.operation.fax = data.fax
if (data.province) {
this.testedCityData = [data.province, data.city, data.county]
this.formObj.province = data.province
this.formObj.city = data.city
this.formObj.county = data.county
}
this.formObj.street = data.street
this.formObj.entrustDate = new Date(data.entrustDate)
this.formObj.odate = new Date(data.odate)
this.formObj.contractCode = data.salesCode
this.formObj.operation.fee = data.discountPrice
if (data.sampleQuoteList) {
this.getPage.records = data.sampleQuoteList
} else {
this.getPage.records = []
}
},
_backVerification(data) { _backVerification(data) {
this.$forceUpdate() this.$forceUpdate()
this.getPage.records[this.index].verification = data.verification this.getPage.records[this.index].verification = data.verification
...@@ -493,15 +422,6 @@ export default { ...@@ -493,15 +422,6 @@ export default {
this.getPage.records.unshift(data) this.getPage.records.unshift(data)
}, },
_importSample() {
const data = {
importUrl: '/meter/v1/sample/import_sample_pre',
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':
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
</template> </template>
<script> <script>
import { soilEntrust, soilSample } from '../../../api' import { soilEntrust, soilSample } from '../../../api'
import http from '../../../api/http'
import Operation from '../../../components/operation/Operation' import Operation from '../../../components/operation/Operation'
import CreateReport from './CreateReport' import CreateReport from './CreateReport'
import SampleManage from './SampleManage' import SampleManage from './SampleManage'
...@@ -216,9 +215,6 @@ export default { ...@@ -216,9 +215,6 @@ export default {
case '附件': case '附件':
this._upload(data.id) this._upload(data.id)
break break
case '导出委托单':
this._exportEntrust(data.id)
break
case '删除': case '删除':
this._deleteByIds([data.id]) this._deleteByIds([data.id])
break break
...@@ -450,16 +446,6 @@ export default { ...@@ -450,16 +446,6 @@ export default {
}) })
// this.$refs.FileManage._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) { _getById: async function(id) {
const result = await soilEntrust.getVOById(id) const result = await soilEntrust.getVOById(id)
if (result) { if (result) {
......
...@@ -190,12 +190,6 @@ export default { ...@@ -190,12 +190,6 @@ export default {
id: '', id: '',
name: '导入试验项目' name: '导入试验项目'
} }
// ,
// {
// type: 'success',
// id: '',
// name: '导入'
// }
], ],
options: [ options: [
{ {
...@@ -346,9 +340,6 @@ export default { ...@@ -346,9 +340,6 @@ export default {
case '导入试验项目': case '导入试验项目':
this._importItem() this._importItem()
break break
case '导入':
this._importSample()
break
case 'search': case 'search':
this.searchOpen = !this.searchOpen this.searchOpen = !this.searchOpen
break break
...@@ -492,16 +483,6 @@ export default { ...@@ -492,16 +483,6 @@ export default {
} }
this.getPage.records.unshift(data) this.getPage.records.unshift(data)
}, },
_importSample() {
const data = {
importUrl: '/meter/v1/sample/import_sample_pre',
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':
......
...@@ -50,7 +50,6 @@ export default { ...@@ -50,7 +50,6 @@ export default {
methods: { methods: {
toSendTask() { toSendTask() {
this.$router.push('/meter/test/send_sample_input') this.$router.push('/meter/test/send_sample_input')
// window.location.href = '/meter/test/send_sample_input'
}, },
_request: async function() { _request: async function() {
// type 请求 0:当天 1:本周 2:本月 // type 请求 0:当天 1:本周 2:本月
......
...@@ -50,7 +50,6 @@ export default { ...@@ -50,7 +50,6 @@ export default {
methods: { methods: {
_toWrite() { _toWrite() {
this.$router.push('/meter/certificate/certificate_make') this.$router.push('/meter/certificate/certificate_make')
// window.location.href = '/meter/certificate/certificate_make'
}, },
_request: async function() { _request: async function() {
// type 请求 0:当天 1:本周 2:本月 // type 请求 0:当天 1:本周 2:本月
......
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