Skip to content

P
patzn-cloud-web-back-soil
Commit 87b2e527 by lichengming
Options

修改了送出检委托单检测依据选择

parent ed89881b
Showing with 410 additions and 4 deletions
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
......@@ -97,8 +97,9 @@
></el-input>
</div>
<div v-if="item.key==='verification'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.verification" blur placeholder="请输入或选择检定（校准）依据"
<el-input v-model="scope.row.verification" blur placeholder="请输入或选择检定（校准）依据" style="width: 170px;"
></el-input>
<a @on-result-change="_judgeBasisChange" @click="_selectverification(scope.$rowIndex)" style="font-size: 18px;" class="">+</a>
</div>
<div v-if="item.key==='manufacturer'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.manufacturer" blur placeholder="请输入制造单位"
......@@ -157,6 +158,7 @@
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
<VerificationModal ref="VerificationModal" @on-result-change="_backVerification"></VerificationModal>
<ContractModal ref="ContractModal" @on-result-change="_backContract" is-change></ContractModal>
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
......@@ -173,6 +175,7 @@ import AutoComplete from '../../../components/base/AutoCompletes'
import importModal from '../../../components/import/DownloadTemplateImport'
import EditModal from './EditModal'
import ContractModal from './ContractModal'
import VerificationModal from './VerificationModal'
export default {
components: {
......@@ -180,7 +183,8 @@ export default {
CityNameCascader,
AutoComplete,
importModal,
ContractModal
ContractModal,
VerificationModal
},
data() {
const validatefee = (rule, value, callback) => {
......@@ -238,7 +242,7 @@ export default {
pageColumns: [
{ title: '样品名称', key: 'name', width: 200 },
{ title: '型号规格', key: 'spec' },
{ title: '检定依据', key: 'verification' },
{ title: '检定依据', key: 'verification', width: 200 },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '制造单位', key: 'manufacturer' },
{ title: '检测类型', key: 'type' },
......@@ -481,6 +485,10 @@ export default {
this.getPage.records = []
}
},
_backVerification(data) {
this.$forceUpdate()
this.getPage.records[this.index].verification = data.verification
},
_selectjudgeBasis(index) {
this.index = index
this.$refs.EditModal._open()
......@@ -488,6 +496,11 @@ export default {
_selectcontractCode() {
this.$refs.ContractModal._open()
},
_selectverification(index) {
console.log(index)
this.index = index
this.$refs.VerificationModal._open()
},
_cascaderResult(name, data, msg) {
switch (name) {
case 'cus':
......
pages/meter-entrust/go-out-test/VerificationModal.vue 0 → 100644
<template>
<div>
<Modal v-model="showUserGroupModal" width="800">
<p slot="header">
{{ modalTitle }}
</p>
<Row>
<!--查询条件-->
<Col span="24">
<Form id="test-item-form" :label-width="90" inline onsubmit="return false">
<label class="label-sign" />
<Form-item :label-width="70" label="授权资质仪器名称" >
<Input
v-model="code"
@on-enter="_pageChange(1)"
placeholder="授权资质仪器名称"
style="width: 100%"
/>
</Form-item>
<Form-item label="检测依据名称">
<Input
v-model="name"
@on-enter="_pageChange(1)"
placeholder="请输入检测依据名称"
style="width: 100%"
/>
</Form-item>
</Form>
</Col>
<Col span="24" style="margin-bottom: 10px">
<el-table
:data="getPage"
@row-click="_rowChange"
@row-dblclick="_dbClick"
border
size="small"
highlight-current-row
style="width: 100%"
>
<el-table-column
v-for="item in pageColumns"
:key="item.key"
:prop="item.key"
:label="item.title"
:min-width="item.width"
show-overflow-tooltip
>
<template slot-scope="scope">
<span v-if="item.key==='status'">
{{ scope.row[item.key]?scope.row[item.key].display:'' }}
</span>
<span v-else>{{ scope.row[item.key] }}</span>
</template>
</el-table-column>
</el-table>
</Col>
<Col span="24">
<Page
:total="getPage.total"
:page-size="getPage.size"
@on-change="_pageChange"
@on-page-size-change="_pageRows"
placement="top"
show-total
show-elevator
show-sizer
/>
<div style="clear: both" />
</Col>
</Row>
<div slot="footer" class="btn-width">
<Button @click="_cancel" style="margin-left: 8px">
取消
</Button>
<Button @click="_ok" type="primary">
确定
</Button>
</div>
</Modal>
</div>
</template>
<script>
// import { meterAptitude } from '../../../api'
import { meterAptitude } from '../../../api'
export default {
name: 'EditModal',
data() {
return {
formObj: {
name: undefined,
code: undefined
},
loading: true,
pageParams: { rows: 20 },
pageColumns: [
{ title: '检定依据', key: 'verification', width: 120 },
{ title: '检定依据名称', key: 'name', width: 140 }
// { title: '传真', key: 'fax', width: 120 },
// { title: '详细地址', key: 'address', width: 250 },
// { title: '登记日期', key: 'edate', width: 120, date: true },
// { title: '要求完成时间', key: 'odate', width: 120, date: true },
// { title: '折扣', key: 'discount', width: 120 },
// { title: '总价', key: 'totalPrice', width: 120 },
// { title: '折扣价', key: 'discountPrice', width: 120 },
// { title: '备注', key: 'remark' }
],
getPage: [],
showUserGroupModal: false,
modalTitle: '',
currentRowData: {},
name: '',
code: ''
}
},
methods: {
_open() {
this.modalTitle = '选择检测依据'
this.name = ''
this.code = ''
this._judge()
},
_judge() {
this.showUserGroupModal = true
this.currentRowData = {}
this._page()
},
_page: async function() {
const result = await meterAptitude.page(this.formObj)
if (result) {
this.getPage = result.records
console.log(this.getPage)
for (let i = 0; i < this.getPage.length; i++) {
this.getPage[i].verification =
this.getPage[i].code + this.getPage[i].name
}
this.loading = false
}
},
_pageChange(page) {
this.pageParams.page = page
this._page()
},
_pageRows(rows) {
this.pageParams.rows = rows
this._page()
},
_searchParams() {
const data = this.$serialize('test-item-form')
if (this.name) {
data.name = this.name
}
if (this.code) {
data.code = this.code
}
return this.$extend(data, this.pageParams)
},
_search() {
this._page()
},
_rowChange(data) {
this.currentRowData = data // 选中的行数据;
},
_cancel() {
this.showUserGroupModal = false
},
_ok() {
if (JSON.stringify(this.currentRowData) === '{}') {
switch (this.modalTitle) {
case '选择检测依据':
this.$Message.warning('请选择一条合同！')
break
}
} else {
this.$emit('on-result-change', this.currentRowData)
this.showUserGroupModal = false
}
},
// 双击
_dbClick(data, event) {
this.currentRowData = data
// 选中的行数据;
this._ok()
}
}
}
</script>
<style scoped>
</style>
pages/meter-entrust/send-test/MeterSendTestEdit.vue
......@@ -91,6 +91,7 @@
<div v-if="item.key==='verification'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.verification" placeholder="请输入检定依据" style="width: 170px;"
></el-input>
<a @on-result-change="_judgeBasisChange" @click="_selectverification(scope.$rowIndex)" style="font-size: 18px;" class="">+</a>
</div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.spec" blur placeholder="请输入型号规格"
......@@ -140,6 +141,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<VerificationModal ref="VerificationModal" @on-result-change="_backVerification"></VerificationModal>
<EditModal ref="EditModal" @on-result-change="_backData" />
<ContractModal ref="ContractModal" @on-result-change="_backContract" is-change></ContractModal>
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
......@@ -155,6 +157,7 @@ import CityNameCascader from '../../../components/base/CityNameCascader'
import AutoComplete from '../../../components/base/AutoCompletes'
import EditModal from './EditModal'
import ContractModal from './ContractModal'
import VerificationModal from './VerificationModal'
export default {
components: {
......@@ -162,7 +165,8 @@ export default {
EditModal,
AutoComplete,
importModal,
ContractModal
ContractModal,
VerificationModal
},
data() {
const validatefee = (rule, value, callback) => {
......@@ -443,6 +447,11 @@ export default {
this.index = index
this.$refs.EditModal._open()
},
_selectverification(index) {
console.log(index)
this.index = index
this.$refs.VerificationModal._open()
},
_selectcontractCode() {
this.$refs.ContractModal._open()
},
......@@ -480,6 +489,10 @@ export default {
this.getPage.records = []
}
},
_backVerification(data) {
this.$forceUpdate()
this.getPage.records[this.index].verification = data.verification
},
_add() {
const data = {
name: '',
......
pages/meter-entrust/send-test/VerificationModal.vue 0 → 100644
<template>
<div>
<Modal v-model="showUserGroupModal" width="800">
<p slot="header">
{{ modalTitle }}
</p>
<Row>
<!--查询条件-->
<Col span="24">
<Form id="test-item-form" :label-width="90" inline onsubmit="return false">
<label class="label-sign" />
<Form-item :label-width="70" label="授权资质仪器名称" >
<Input
v-model="code"
@on-enter="_pageChange(1)"
placeholder="授权资质仪器名称"
style="width: 100%"
/>
</Form-item>
<Form-item label="检测依据名称">
<Input
v-model="name"
@on-enter="_pageChange(1)"
placeholder="请输入检测依据名称"
style="width: 100%"
/>
</Form-item>
</Form>
</Col>
<Col span="24" style="margin-bottom: 10px">
<el-table
:data="getPage"
@row-click="_rowChange"
@row-dblclick="_dbClick"
border
size="small"
highlight-current-row
style="width: 100%"
>
<el-table-column
v-for="item in pageColumns"
:key="item.key"
:prop="item.key"
:label="item.title"
:min-width="item.width"
show-overflow-tooltip
>
<template slot-scope="scope">
<span v-if="item.key==='status'">
{{ scope.row[item.key]?scope.row[item.key].display:'' }}
</span>
<span v-else>{{ scope.row[item.key] }}</span>
</template>
</el-table-column>
</el-table>
</Col>
<Col span="24">
<Page
:total="getPage.total"
:page-size="getPage.size"
@on-change="_pageChange"
@on-page-size-change="_pageRows"
placement="top"
show-total
show-elevator
show-sizer
/>
<div style="clear: both" />
</Col>
</Row>
<div slot="footer" class="btn-width">
<Button @click="_cancel" style="margin-left: 8px">
取消
</Button>
<Button @click="_ok" type="primary">
确定
</Button>
</div>
</Modal>
</div>
</template>
<script>
// import { meterAptitude } from '../../../api'
import { meterAptitude } from '../../../api'
export default {
name: 'EditModal',
data() {
return {
formObj: {
name: undefined,
code: undefined
},
loading: true,
pageParams: { rows: 20 },
pageColumns: [
{ title: '检定依据', key: 'verification', width: 120 },
{ title: '检定依据名称', key: 'name', width: 140 }
// { title: '传真', key: 'fax', width: 120 },
// { title: '详细地址', key: 'address', width: 250 },
// { title: '登记日期', key: 'edate', width: 120, date: true },
// { title: '要求完成时间', key: 'odate', width: 120, date: true },
// { title: '折扣', key: 'discount', width: 120 },
// { title: '总价', key: 'totalPrice', width: 120 },
// { title: '折扣价', key: 'discountPrice', width: 120 },
// { title: '备注', key: 'remark' }
],
getPage: [],
showUserGroupModal: false,
modalTitle: '',
currentRowData: {},
name: '',
code: ''
}
},
methods: {
_open() {
this.modalTitle = '选择检测依据'
this.name = ''
this.code = ''
this._judge()
},
_judge() {
this.showUserGroupModal = true
this.currentRowData = {}
this._page()
},
_page: async function() {
const result = await meterAptitude.page(this.formObj)
if (result) {
this.getPage = result.records
console.log(this.getPage)
for (let i = 0; i < this.getPage.length; i++) {
this.getPage[i].verification =
this.getPage[i].code + this.getPage[i].name
}
this.loading = false
}
},
_pageChange(page) {
this.pageParams.page = page
this._page()
},
_pageRows(rows) {
this.pageParams.rows = rows
this._page()
},
_searchParams() {
const data = this.$serialize('test-item-form')
if (this.name) {
data.name = this.name
}
if (this.code) {
data.code = this.code
}
return this.$extend(data, this.pageParams)
},
_search() {
this._page()
},
_rowChange(data) {
this.currentRowData = data // 选中的行数据;
},
_cancel() {
this.showUserGroupModal = false
},
_ok() {
if (JSON.stringify(this.currentRowData) === '{}') {
switch (this.modalTitle) {
case '选择检测依据':
this.$Message.warning('请选择一条合同！')
break
}
} else {
this.$emit('on-result-change', this.currentRowData)
this.showUserGroupModal = false
}
},
// 双击
_dbClick(data, event) {
this.currentRowData = data
// 选中的行数据;
this._ok()
}
}
}
</script>
<style scoped>
</style>
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