Skip to content

P
patzn-cloud-web-back-soil
Commit 9fe2d52a by wangweidong
Options

Merge remote-tracking branch 'origin/dev' into dev

parents c627b2a3 145de150
Showing with 64 additions and 15 deletions
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
......@@ -10,8 +10,8 @@
</Radio-group>
</Form-item>
<Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" name="client"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
<AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
></AutoComplete>
</Form-item>
<Form-item label="联系人" prop="operation.person" class="width-48">
......@@ -24,7 +24,7 @@
<Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader v-model="testedCityData" @on-result-change="_cascaderResult" name="tested">
</CityNameCascader>
</Form-item>
<Form-item label="街道" prop="street" class="width-48">
......@@ -38,13 +38,13 @@
<Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
</Form-item>
<Form-item label="委托日期：" prop="edate" class="width-48">
<Date-picker type="date" v-model="formObj.edate" split-panels style="width:100%;" placeholder="请选择委托日期"
@on-change="_ctimeChange"></Date-picker>
<Date-picker v-model="formObj.edate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择委托日期"></Date-picker>
</Form-item>
<Form-item label="要求完成日期：" prop="odate" class="width-48">
<Date-picker type="date" v-model="formObj.odate" split-panels style="width:100%;" placeholder="请选择要求完成"
@on-change="_odateChange"></Date-picker>
<Date-picker v-model="formObj.odate" @on-change="_odateChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成"></Date-picker>
</Form-item>
......@@ -59,7 +59,7 @@
<Col span="24">
<!-- <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
<!-- class="contHide"></btn-list>-->
<Button type="success" @click="_add()">添加</Button>
<Button @click="_add()" type="success">添加</Button>
</Col>
<Col span="24">
<PTVXETable
......@@ -81,7 +81,7 @@
>
<template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)"
<el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur placeholder="请输入或选择样品名称"
></el-input>
</div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
......@@ -102,9 +102,9 @@
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.quantity"
@keydown.native="channelInputLimit"
type="number"
placeholder="请输入或选择数量"
@keydown.native="channelInputLimit"
/>
</div>
</template>
......@@ -115,7 +115,7 @@
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
<EditModal ref="EditModal" is-change @on-result-change="_backData" />
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
</Modal>
</div>
</template>
......@@ -145,6 +145,20 @@ export default {
callback()
}
}
const validateEdate = (rule, value, callback) => {
if (this.formObj.edate === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
const validateOdate = (rule, value, callback) => {
if (this.formObj.odate === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
return {
formId: 'meterSendTestEditFormId',
getPage: {
......@@ -236,10 +250,20 @@ export default {
}
],
edate: [
{ required: true, message: '委托日期不能为空', trigger: 'blur' }
{
required: true,
validator: validateEdate,
message: '委托日期不能为空',
trigger: 'blur'
}
],
odate: [
{ required: true, message: '要求完成时间不能为空', trigger: 'blur' }
{
required: true,
validator: validateOdate,
message: '要求完成时间不能为空',
trigger: 'blur'
}
],
'operation.person': [
{ required: true, message: '联系人不能为空', trigger: 'blur' }
......@@ -539,6 +563,7 @@ export default {
this._hideLoading()
this.id = ''
this.modalTitle = '出检委托单编辑'
console.log('编辑', formObj)
this.id = formObj.id
this.formObj = formObj
this._showAddress(formObj)
......
pages/meter-entrust/send-test/MeterSendTestEdit.vue
......@@ -157,6 +157,20 @@ export default {
callback()
}
}
const validateEdate = (rule, value, callback) => {
if (this.formObj.edate === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
const validateOdate = (rule, value, callback) => {
if (this.formObj.odate === '') {
callback(new Error('内容不能为空'))
} else {
callback()
}
}
return {
formId: 'meterSendTestEditFormId',
getPage: {
......@@ -240,10 +254,20 @@ export default {
}
],
edate: [
{ required: true, message: '委托日期不能为空', trigger: 'blur' }
{
required: true,
validator: validateEdate,
message: '委托日期不能为空',
trigger: 'blur'
}
],
odate: [
{ required: true, message: '要求完成时间不能为空', trigger: 'blur' }
{
required: true,
validator: validateOdate,
message: '要求完成时间不能为空',
trigger: 'blur'
}
],
'operation.person': [
{ required: true, message: '联系人不能为空', trigger: 'blur' }
......
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