Skip to content

P
patzn-cloud-web-back-soil
Commit b1ba4283 by lichengming
Options

修改了送出检委托单的合同号按钮

parent b719b6c4
Showing with 398 additions and 17 deletions
pages/meter-entrust/go-out-test/ContractModal.vue 0 → 100644
<template>
<div>
<Modal v-model="showUserGroupModal">
<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"
placeholder="授权资质仪器名称"
style="width: 100%"
@on-enter="_pageChange(1)"
/>
</Form-item>
<Form-item label="检测依据名称">
<Input
v-model="name"
placeholder="请输入检测依据名称"
style="width: 100%"
@on-enter="_pageChange(1)"
/>
</Form-item>
</Form>
</Col>
<Col span="24" style="margin-bottom: 10px">
<el-table
:height="300"
:data="getPage"
border
size="small"
highlight-current-row
style="width: 100%"
@row-click="_rowChange"
@row-dblclick="_dbClick"
>
<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"
placement="top"
show-total
show-elevator
show-sizer
@on-change="_pageChange"
@on-page-size-change="_pageRows"
/>
<div style="clear: both" />
</Col>
</Row>
<div slot="footer" class="btn-width">
<Button style="margin-left: 8px" @click="_cancel">
取消
</Button>
<Button type="primary" @click="_ok">
确定
</Button>
</div>
</Modal>
</div>
</template>
<script>
// import { meterAptitude } from '../../../api'
import { meterManage } from '../../../api'
export default {
name: 'EditModal',
data() {
return {
loading: true,
pageParams: { rows: 20 },
pageColumns: [
{ title: '样品名称', key: 'name' },
{ title: '检定依据', key: 'code' },
{ title: '检定依据名称', key: 'basis' }
],
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 meterManage.page(this._searchParams())
if (result) {
this.getPage = result.records
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/go-out-test/MeterGoOutTestEdit.vue
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
placeholder="请选择要求完成"></Date-picker> placeholder="请选择要求完成"></Date-picker>
</Form-item> </Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-48"> <Form-item label="合同号：" prop="contractCode" class="width-48">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/> <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 465px;"/>
<span @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span>
</Form-item> </Form-item>
<Form-item label="备注：" prop="remark" style="width: 99.8%"> <Form-item label="备注：" prop="remark" style="width: 99.8%">
<Input v-model="formObj.remark" :rows="3" name="remark" type="textarea" <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
...@@ -83,8 +84,9 @@ ...@@ -83,8 +84,9 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur placeholder="请输入或选择样品名称" <el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" blur placeholder="请输入或选择样品名称" style="width: 150px;"
></el-input> ></el-input>
<a @on-result-change="_judgeBasisChange" @click="_selectjudgeBasis(scope.$rowIndex)" style="font-size: 18px;" class="">+</a>
</div> </div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.spec" blur placeholder="请输入型号规格" <el-input v-model="scope.row.spec" blur placeholder="请输入型号规格"
...@@ -155,6 +157,7 @@ ...@@ -155,6 +157,7 @@
<div slot="footer"> <div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer> <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div> </div>
<ContractModal ref="ContractModal" @on-result-change="_backContract" is-change></ContractModal>
<EditModal ref="EditModal" @on-result-change="_backData" is-change /> <EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal> <importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</Modal> </Modal>
...@@ -169,9 +172,16 @@ import CityNameCascader from '../../../components/base/CityNameCascader' ...@@ -169,9 +172,16 @@ import CityNameCascader from '../../../components/base/CityNameCascader'
import AutoComplete from '../../../components/base/AutoCompletes' import AutoComplete from '../../../components/base/AutoCompletes'
import importModal from '../../../components/import/DownloadTemplateImport' import importModal from '../../../components/import/DownloadTemplateImport'
import EditModal from './EditModal' import EditModal from './EditModal'
import ContractModal from './ContractModal'
export default { export default {
components: { EditModal, CityNameCascader, AutoComplete, importModal }, components: {
EditModal,
CityNameCascader,
AutoComplete,
importModal,
ContractModal
},
data() { data() {
const validatefee = (rule, value, callback) => { const validatefee = (rule, value, callback) => {
if (this.formObj.operation.fee === '') { if (this.formObj.operation.fee === '') {
...@@ -225,7 +235,7 @@ export default { ...@@ -225,7 +235,7 @@ export default {
} }
], ],
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name', width: 160 }, { title: '样品名称', key: 'name', width: 200 },
{ title: '型号规格', key: 'spec' }, { title: '型号规格', key: 'spec' },
{ title: '检定依据', key: 'verification' }, { title: '检定依据', key: 'verification' },
{ title: '出厂编号', key: 'factoryNumber' }, { title: '出厂编号', key: 'factoryNumber' },
...@@ -445,10 +455,16 @@ export default { ...@@ -445,10 +455,16 @@ export default {
this.getPage.records[this.index].aptitudeId = data.id this.getPage.records[this.index].aptitudeId = data.id
this.getPage.records[this.index].verification = data.code + data.basis this.getPage.records[this.index].verification = data.code + data.basis
}, },
_backContract(data) {
console.log(data)
},
_selectjudgeBasis(index) { _selectjudgeBasis(index) {
this.index = index this.index = index
this.$refs.EditModal._open() this.$refs.EditModal._open()
}, },
_selectcontractCode() {
this.$refs.ContractModal._open()
},
_cascaderResult(name, data, msg) { _cascaderResult(name, data, msg) {
switch (name) { switch (name) {
case 'cus': case 'cus':
......
pages/meter-entrust/send-test/ContractModal.vue 0 → 100644
<template>
<div>
<Modal v-model="showUserGroupModal">
<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"
placeholder="授权资质仪器名称"
style="width: 100%"
@on-enter="_pageChange(1)"
/>
</Form-item>
<Form-item label="检测依据名称">
<Input
v-model="name"
placeholder="请输入检测依据名称"
style="width: 100%"
@on-enter="_pageChange(1)"
/>
</Form-item>
</Form>
</Col>
<Col span="24" style="margin-bottom: 10px">
<el-table
:height="300"
:data="getPage"
border
size="small"
highlight-current-row
style="width: 100%"
@row-click="_rowChange"
@row-dblclick="_dbClick"
>
<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"
placement="top"
show-total
show-elevator
show-sizer
@on-change="_pageChange"
@on-page-size-change="_pageRows"
/>
<div style="clear: both" />
</Col>
</Row>
<div slot="footer" class="btn-width">
<Button style="margin-left: 8px" @click="_cancel">
取消
</Button>
<Button type="primary" @click="_ok">
确定
</Button>
</div>
</Modal>
</div>
</template>
<script>
// import { meterAptitude } from '../../../api'
import { meterManage } from '../../../api'
export default {
name: 'EditModal',
data() {
return {
loading: true,
pageParams: { rows: 20 },
pageColumns: [
{ title: '样品名称', key: 'name' },
{ title: '检定依据', key: 'code' },
{ title: '检定依据名称', key: 'basis' }
],
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 meterManage.page(this._searchParams())
if (result) {
this.getPage = result.records
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/MeterSendEntrustHis.vue
...@@ -6,29 +6,29 @@ ...@@ -6,29 +6,29 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="委托单位:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.client" name="name" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" @on-enter="_formSearch" name="name" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="委托单号:"> <Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/> <Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></btn-list>
</Col> </Col>
<!--表格--> <!--表格-->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" hide-checkbox @on-result-change="_tableResultChange"> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
......
pages/meter-entrust/send-test/MeterSendTestEdit.vue
...@@ -50,8 +50,9 @@ ...@@ -50,8 +50,9 @@
placeholder="请选择要求完成日期"></Date-picker> placeholder="请选择要求完成日期"></Date-picker>
</Form-item> </Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-48"> <Form-item label="合同号：" prop="contractCode" class="width-96">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/> <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 495px;"/>
<span @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span>
</Form-item> </Form-item>
<Form-item label="备注：" prop="remark" style="width: 99.8%"> <Form-item label="备注：" prop="remark" style="width: 99.8%">
<Input v-model="formObj.remark" :rows="3" name="remark" type="textarea" <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
...@@ -83,8 +84,9 @@ ...@@ -83,8 +84,9 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur placeholder="请输入或选择样品名称" <el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" blur placeholder="请输入或选择样品名称" style="width: 150px;"
></el-input> ></el-input>
<a @on-result-change="_judgeBasisChange" @click="_selectjudgeBasis(scope.$rowIndex)" style="font-size: 18px;" class="">+</a>
</div> </div>
<div v-if="item.key==='verification'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='verification'" @click.stop="_handleRow(scope)">
...@@ -140,7 +142,7 @@ ...@@ -140,7 +142,7 @@
</div> </div>
</Modal> </Modal>
<EditModal ref="EditModal" @on-result-change="_backData" is-change /> <EditModal ref="EditModal" @on-result-change="_backData" is-change />
<ContractModal ref="ContractModal" @on-result-change="_backContract" is-change></ContractModal>
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal> <importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div> </div>
</template> </template>
...@@ -153,9 +155,16 @@ import importModal from '../../../components/import/DownloadTemplateImport' ...@@ -153,9 +155,16 @@ import importModal from '../../../components/import/DownloadTemplateImport'
import CityNameCascader from '../../../components/base/CityNameCascader' import CityNameCascader from '../../../components/base/CityNameCascader'
import AutoComplete from '../../../components/base/AutoCompletes' import AutoComplete from '../../../components/base/AutoCompletes'
import EditModal from './EditModal' import EditModal from './EditModal'
import ContractModal from './ContractModal'
export default { export default {
components: { CityNameCascader, EditModal, AutoComplete, importModal }, components: {
CityNameCascader,
EditModal,
AutoComplete,
importModal,
ContractModal
},
data() { data() {
const validatefee = (rule, value, callback) => { const validatefee = (rule, value, callback) => {
if (this.formObj.operation.fee === '') { if (this.formObj.operation.fee === '') {
...@@ -210,7 +219,7 @@ export default { ...@@ -210,7 +219,7 @@ export default {
} }
], ],
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name', width: 160 }, { title: '样品名称', key: 'name', width: 200 },
{ title: '型号规格', key: 'spec' }, { title: '型号规格', key: 'spec' },
{ title: '检定依据', key: 'verification' }, { title: '检定依据', key: 'verification' },
{ title: '出厂编号', key: 'factoryNumber' }, { title: '出厂编号', key: 'factoryNumber' },
...@@ -434,6 +443,9 @@ export default { ...@@ -434,6 +443,9 @@ export default {
this.index = index this.index = index
this.$refs.EditModal._open() this.$refs.EditModal._open()
}, },
_selectcontractCode() {
this.$refs.ContractModal._open()
},
_backData(data) { _backData(data) {
console.log(typeof this.index) console.log(typeof this.index)
this.getPage.records[this.index].name = data.name this.getPage.records[this.index].name = data.name
...@@ -445,6 +457,9 @@ export default { ...@@ -445,6 +457,9 @@ export default {
console.log('返回的数据', data) console.log('返回的数据', data)
console.log(this.getPage.records) console.log(this.getPage.records)
}, },
_backContract(data) {
console.log(data)
},
_add() { _add() {
const data = { const data = {
name: '', name: '',
......
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