Commit a4603060 by lichengming

修改了委托单登记

parent 92f12817
<template> <template>
<div> <div>
<Modal v-model="showModal" :mask-closable="false" width="1200"> <Modal v-model="showModal" :mask-closable="false" width="1200">
<p slot="header">{{modalTitle}}</p> <p slot="header">{{modalTitle}}</p>
<div> <div>
...@@ -20,7 +17,7 @@ ...@@ -20,7 +17,7 @@
<Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/> <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/>
</Form-item> </Form-item>
<Form-item label="钻孔位置" prop="boreholeLocation" class="width-48"> <Form-item label="钻孔位置" prop="boreholeLocation" class="width-48">
<Input v-model="formObj.boreholeLocation" name="boreholeLocation" placeholder="请输入名称"/> <Input v-model="formObj.boreholeLocation" name="boreholeLocation" placeholder="请输入钻孔位置"/>
</Form-item> </Form-item>
<Form-item label="纬度" prop="latitude" class="width-48"> <Form-item label="纬度" prop="latitude" class="width-48">
<Input v-model="formObj.latitude" name="latitude" placeholder="请输入纬度"/> <Input v-model="formObj.latitude" name="latitude" placeholder="请输入纬度"/>
...@@ -83,11 +80,6 @@ ...@@ -83,11 +80,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>
...@@ -102,8 +94,6 @@ ...@@ -102,8 +94,6 @@
></AutoComplete> ></AutoComplete>
</div> </div>
<div v-if="item.key==='sampleDescribe'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='sampleDescribe'" @click.stop="_handleRow(scope)">
<!-- <el-input v-model="scope.row.sampleDescribe" blur placeholder="请输入土质描述"-->
<!-- ></el-input>-->
<AutoComplete v-model="scope.row.sampleDescribe" :downData="soilList" <AutoComplete v-model="scope.row.sampleDescribe" :downData="soilList"
@on-result-change="_soilChange" name="sampleDescribe" placeholder="请输入或选择土质描述" @on-result-change="_soilChange" name="sampleDescribe" placeholder="请输入或选择土质描述"
></AutoComplete> ></AutoComplete>
...@@ -149,62 +139,6 @@ export default { ...@@ -149,62 +139,6 @@ export default {
SampleItemEdit SampleItemEdit
}, },
data() { data() {
const validatefee = (rule, value, callback) => {
if (this.formObj.operation.fee === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
const validwaterdepth = (rule, value, callback) => {
if (this.formObj.waterDepth === '') {
callback(new Error('水深不能为空'))
} else {
callback()
}
}
const validboreholeLocation = (rule, value, callback) => {
if (this.formObj.boreholeLocation === '') {
callback(new Error('钻孔位置不能为空'))
} else {
callback()
}
}
const validboreholeName = (rule, value, callback) => {
if (this.formObj.boreholeName === '') {
callback(new Error('钻孔名称不能为空'))
} else {
callback()
}
}
const validateRemark = (rule, value, callback) => {
if (this.testedCityData.length === 0) {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
const validateClient = (rule, value, callback) => {
if (this.formObj.client === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
const validateEdate = (rule, value, callback) => {
if (this.formObj.entrustDate === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
const validateOdate = (rule, value, callback) => {
if (this.formObj.odate === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
return { return {
formId: 'meterSendTestEditFormId', formId: 'meterSendTestEditFormId',
getPage: { getPage: {
...@@ -245,12 +179,6 @@ export default { ...@@ -245,12 +179,6 @@ export default {
id: '', id: '',
name: '导入试验项目' name: '导入试验项目'
} }
// ,
// {
// type: 'success',
// id: '',
// name: '导入'
// }
], ],
btnEdit: [ btnEdit: [
{ {
...@@ -268,12 +196,6 @@ export default { ...@@ -268,12 +196,6 @@ export default {
id: '', id: '',
name: '导入试验项目' name: '导入试验项目'
} }
// ,
// {
// type: 'success',
// id: '',
// name: '导入'
// }
], ],
options: [ options: [
{ {
...@@ -297,79 +219,6 @@ export default { ...@@ -297,79 +219,6 @@ export default {
selectIds: [], selectIds: [],
indexList: [], indexList: [],
itemList: [], itemList: [],
ruleValidate: {
client: [
{
required: true,
message: '委托单位不能为空',
validator: validateClient,
trigger: ['blur', 'change']
}
],
boreholeName: [
{
required: true,
validator: validboreholeName,
message: '钻孔名称不能为空',
trigger: 'blur'
}
],
boreholeLocation: [
{
required: true,
validator: validboreholeLocation,
message: '钻孔位置不能为空',
trigger: 'blur'
}
],
waterDepth: [
{
required: true,
validator: validwaterdepth,
message: '水深不能为空',
trigger: 'blur'
}
],
entrustDate: [
{
required: true,
validator: validateEdate,
message: '委托日期不能为空',
trigger: 'blur'
}
],
odate: [
{
required: true,
validator: validateOdate,
message: '要求完成时间不能为空',
trigger: 'blur'
}
],
'operation.person': [
{ required: true, message: '联系人不能为空', trigger: 'blur' }
],
'operation.fee': [
{
required: true,
validator: validatefee,
message: '委托费用不能为空',
trigger: 'blur'
}
],
'operation.tel': [
{ required: true, message: '联系电话不能为空', trigger: 'blur' }
],
testedCityData: [
{
required: true,
message: '省市区不能为空',
validator: validateRemark,
trigger: 'blur'
}
]
},
clearingWayList: ['款到后测试', '先测试后付款', '其他情况()'], clearingWayList: ['款到后测试', '先测试后付款', '其他情况()'],
clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况()'], clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况()'],
showModal: false, showModal: false,
......
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