Skip to content

P
patzn-cloud-web-back-soil
Commit 3a012504 by lichengming
Options

修改了送出检管理合同号弹出框

parent c3a0a7da
Showing with 82 additions and 15 deletions
layouts/default.vue
<template> <template>
<div> <div >
<header-menu :crumbs="crumbsList" @on-result-change="_headerMenuResult"/> <header-menu :crumbs="crumbsList" @on-result-change="_headerMenuResult"/>
<div class="iview-layout-nuxt" :class="{'shrink-iview-layout-nuxt':isShrink}"> <div v-if="show" :class="{'shrink-iview-layout-nuxt':isShrink}" class="iview-layout-nuxt">
<nuxt /> <nuxt />
</div> </div>
</div> </div>
...@@ -18,7 +18,8 @@ export default { ...@@ -18,7 +18,8 @@ export default {
data() { data() {
return { return {
isShrink: false, isShrink: false,
crumbsList: [] crumbsList: [],
show: false
} }
}, },
watch: { watch: {
...@@ -27,6 +28,7 @@ export default { ...@@ -27,6 +28,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.show = true
this._setBreadCrumb(this.$route) this._setBreadCrumb(this.$route)
this._initLoad() this._initLoad()
}, },
......
pages/meter-entrust/go-out-test/ContractModal.vue
...@@ -83,17 +83,30 @@ ...@@ -83,17 +83,30 @@
<script> <script>
// import { meterAptitude } from '../../../api' // import { meterAptitude } from '../../../api'
import { meterManage } from '../../../api' import { meterContract } from '../../../api'
export default { export default {
name: 'EditModal', name: 'EditModal',
data() { data() {
return { return {
formObj: {
client: undefined,
salesCode: undefined
},
loading: true, loading: true,
pageParams: { rows: 20 }, pageParams: { rows: 20 },
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name' }, { title: '合同编号', key: 'salesCode', width: 120 },
{ title: '检定依据', key: 'code' }, { title: '委托单位', key: 'client', width: 200 },
{ title: '检定依据名称', key: 'basis' } { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }
// { 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: [], getPage: [],
showUserGroupModal: false, showUserGroupModal: false,
...@@ -115,10 +128,18 @@ export default { ...@@ -115,10 +128,18 @@ export default {
this.currentRowData = {} this.currentRowData = {}
this._page() this._page()
}, },
// _page: async function() {
// const result = await meterManage.page(this._searchParams())
// if (result) {
// this.getPage = result.records
// this.loading = false
// }
// },
_page: async function() { _page: async function() {
const result = await meterManage.page(this._searchParams()) const result = await meterContract.pageContractReviewHis(this.formObj)
if (result) { if (result) {
this.getPage = result.records this.getPage = result.records
console.log(this.getPage)
this.loading = false this.loading = false
} }
}, },
......
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
...@@ -457,6 +457,21 @@ export default { ...@@ -457,6 +457,21 @@ export default {
}, },
_backContract(data) { _backContract(data) {
console.log(data) console.log(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.edate = new Date(data.edate)
this.formObj.odate = new Date(data.odate)
this.formObj.contractCode = data.salesCode
this.formObj.operation.fee = data.totalPrice
}, },
_selectjudgeBasis(index) { _selectjudgeBasis(index) {
this.index = index this.index = index
......
pages/meter-entrust/send-test/ContractModal.vue
<template> <template>
<div> <div>
<Modal v-model="showUserGroupModal"> <Modal v-model="showUserGroupModal" width="600">
<p slot="header"> <p slot="header">
{{ modalTitle }} {{ modalTitle }}
</p> </p>
...@@ -83,17 +83,30 @@ ...@@ -83,17 +83,30 @@
<script> <script>
// import { meterAptitude } from '../../../api' // import { meterAptitude } from '../../../api'
import { meterManage } from '../../../api' import { meterContract } from '../../../api'
export default { export default {
name: 'EditModal', name: 'EditModal',
data() { data() {
return { return {
formObj: {
client: undefined,
salesCode: undefined
},
loading: true, loading: true,
pageParams: { rows: 20 }, pageParams: { rows: 20 },
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name' }, { title: '合同编号', key: 'salesCode', width: 120 },
{ title: '检定依据', key: 'code' }, { title: '委托单位', key: 'client', width: 200 },
{ title: '检定依据名称', key: 'basis' } { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }
// { 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: [], getPage: [],
showUserGroupModal: false, showUserGroupModal: false,
...@@ -116,9 +129,10 @@ export default { ...@@ -116,9 +129,10 @@ export default {
this._page() this._page()
}, },
_page: async function() { _page: async function() {
const result = await meterManage.page(this._searchParams()) const result = await meterContract.pageContractReviewHis(this.formObj)
if (result) { if (result) {
this.getPage = result.records this.getPage = result.records
console.log(this.getPage)
this.loading = false this.loading = false
} }
}, },
......
pages/meter-entrust/send-test/MeterSendTestEdit.vue
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
<Date-picker v-model="formObj.odate" @on-change="_odateChange" type="date" split-panels style="width:100%;" <Date-picker v-model="formObj.odate" @on-change="_odateChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成日期"></Date-picker> placeholder="请选择要求完成日期"></Date-picker>
</Form-item> </Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-96"> <Form-item label="合同号：" prop="contractCode" class="width-96">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 495px;"/> <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 495px;"/>
<span @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span> <span @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span>
...@@ -459,6 +458,21 @@ export default { ...@@ -459,6 +458,21 @@ export default {
}, },
_backContract(data) { _backContract(data) {
console.log(data) console.log(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.edate = new Date(data.edate)
this.formObj.odate = new Date(data.odate)
this.formObj.contractCode = data.salesCode
this.formObj.operation.fee = data.totalPrice
}, },
_add() { _add() {
const data = { const data = {
...@@ -690,6 +704,7 @@ export default { ...@@ -690,6 +704,7 @@ export default {
this.formObj.odate = '' this.formObj.odate = ''
} else { } else {
this.formObj.odate = new Date(formObj.odate) this.formObj.odate = new Date(formObj.odate)
console.log('转换格式后的时间', this.formObj.odate)
} }
if (this.formObj.edate === undefined) { if (this.formObj.edate === undefined) {
......
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