Skip to content

P
patzn-cloud-web-back-soil
Commit 54be3cea by wangweidong
Options

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

# Conflicts:
#	pages/meter-certificate/issue/MeterCertificateIssueHis.vue
parents 9d189ea1 3526534f
Showing with 341 additions and 241 deletions
components/file/file-manage/FilesList.vue
...@@ -148,8 +148,8 @@ export default { ...@@ -148,8 +148,8 @@ export default {
imgViewIndex: null, imgViewIndex: null,
iconMsg: [ iconMsg: [
{ type: 'md-remove-circle', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
{ type: 'ios-download', id: '', name: '下载' }, { type: 'ios-download', id: '', name: '下载' }
{ type: 'ios-eye', id: '', name: '预览' } // { type: 'ios-eye', id: '', name: '预览' }
], ],
iconMsgDis: [ iconMsgDis: [
{ type: 'trash-a', id: '', name: '删除' }, { type: 'trash-a', id: '', name: '删除' },
...@@ -291,6 +291,7 @@ export default { ...@@ -291,6 +291,7 @@ export default {
}, },
// 预览图片（该合同下所有的） // 预览图片（该合同下所有的）
_viewImg: async function(data) { _viewImg: async function(data) {
console.log(data)
if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') { if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {
const id = data.entrustId const id = data.entrustId
const result = await meterEntrust.entrustPreview(id) const result = await meterEntrust.entrustPreview(id)
......
pages/meter-business/accepted/MeterContractAcceptedHis.vue
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
</Row> </Row>
</div> </div>
</div> </div>
<FileManage ref="FileManage"></FileManage>
<MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage> <MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage>
<MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord> <MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord>
</div> </div>
...@@ -188,7 +189,8 @@ export default { ...@@ -188,7 +189,8 @@ export default {
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') // this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterSubcontractor.getById(id)
......
pages/meter-business/quote-approval/MeterContractApproval.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span> <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-if="item.status">{{scope.row[item.key].display}}</span> <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
<span v-else>{{scope.row[item.key]}}</span> <span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
......
pages/meter-business/quote-approval/MeterContractApprovalHis.vue
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
</Row> </Row>
</div> </div>
</div> </div>
<FileManage ref="FileManage"></FileManage>
<MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage> <MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage>
<MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord> <MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord>
</div> </div>
...@@ -188,7 +189,8 @@ export default { ...@@ -188,7 +189,8 @@ export default {
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') // this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterSubcontractor.getById(id)
......
pages/meter-business/quote-check-second/MeterContractCheckSecond.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span> <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-if="item.status">{{scope.row[item.key].display}}</span> <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
<span v-else>{{scope.row[item.key]}}</span> <span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
......
pages/meter-business/quote-check-second/MeterContractCheckSecondHis.vue
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
</Row> </Row>
</div> </div>
</div> </div>
<FileManage ref="FileManage"></FileManage>
<MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage> <MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage>
<MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord> <MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord>
</div> </div>
...@@ -188,7 +189,7 @@ export default { ...@@ -188,7 +189,7 @@ export default {
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterSubcontractor.getById(id)
......
pages/meter-business/quote-check/MeterContractCheck.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span> <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-if="item.status">{{scope.row[item.key].display}}</span> <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
<span v-else>{{scope.row[item.key]}}</span> <span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
......
pages/meter-business/quote-check/MeterContractCheckHis.vue
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
</Row> </Row>
</div> </div>
</div> </div>
<FileManage ref="FileManage"></FileManage>
<MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage> <MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage>
<MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord> <MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord>
</div> </div>
...@@ -188,7 +189,7 @@ export default { ...@@ -188,7 +189,7 @@ export default {
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterSubcontractor.getById(id)
......
pages/meter-business/quote-register/MeterQuoteRegister.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract } from '../../../api'
import MeterSendOperation from '../MeterContractRecord' import MeterSendOperation from '../MeterContractRecord'
import MeterSampleManage from '../MeterSampleQuoteManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterQuoteRegisterEdit' import MeterSubcontractorEdit from './MeterQuoteRegisterEdit'
...@@ -259,7 +259,7 @@ export default { ...@@ -259,7 +259,7 @@ export default {
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功！') this.$Message.success('删除成功！')
......
pages/meter-business/quote-register/MeterQuoteRegisterHis.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</Row> </Row>
</div> </div>
</div> </div>
<FileManage ref="FileManage"></FileManage>
<MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage> <MeterSampleQuoteManage ref="meterSampleQuoteManageModal" @on-result-change="_formSearch"></MeterSampleQuoteManage>
<MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord> <MeterContractRecord ref="meterContractRecordModal" @on-result-change="_formSearch"></MeterContractRecord>
</div> </div>
...@@ -196,7 +196,7 @@ export default { ...@@ -196,7 +196,7 @@ export default {
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterSubcontractor.getById(id)
......
pages/meter-certificate/check/MeterCertificateCheck.vue
...@@ -94,11 +94,11 @@ export default { ...@@ -94,11 +94,11 @@ export default {
id: '', id: '',
name: '查看证书' name: '查看证书'
}, },
{ // {
type: 'ios-list-box', // type: 'ios-list-box',
id: '', // id: '',
name: '仪器领用' // name: '仪器领用'
}, // },
{ type: 'md-cloud', id: '', name: '附件' } { type: 'md-cloud', id: '', name: '附件' }
], ],
formObj: { formObj: {
......
pages/meter-certificate/check/MeterCertificateCheckHis.vue
...@@ -94,11 +94,11 @@ export default { ...@@ -94,11 +94,11 @@ export default {
id: '', id: '',
name: '查看证书' name: '查看证书'
}, },
{ // {
type: 'ios-list-box', // type: 'ios-list-box',
id: '', // id: '',
name: '仪器领用' // name: '仪器领用'
}, // },
{ type: 'md-cloud', id: '', name: '附件' } { type: 'md-cloud', id: '', name: '附件' }
], ],
formObj: { formObj: {
......
pages/meter-certificate/print/MeterCertificatePrint.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.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @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.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/> <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" 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" select-data @on-result-change="_tableResultChange"> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -147,6 +147,7 @@ export default { ...@@ -147,6 +147,7 @@ export default {
} }
}) })
}, },
_resultRecord() {},
_submitToReview() { _submitToReview() {
this._submitByContractIds() this._submitByContractIds()
}, },
......
pages/meter-contract/contract-register/MeterContractRegister.vue
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract } from '../../../api'
import MeterSendOperation from '../MeterContractReviewOperation' import MeterSendOperation from '../MeterContractReviewOperation'
import MeterSampleManage from '../MeterSampleQuoteManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterContractRegisterEdit' import MeterSubcontractorEdit from './MeterContractRegisterEdit'
...@@ -184,16 +184,18 @@ export default { ...@@ -184,16 +184,18 @@ export default {
title: '提示', title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？', content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => { onOk: () => {
const result = meterContract.submitToContractReview(ids) this._submit(ids)
if (result) {
this._resultChange('提交成功')
console.log(result)
}
// }) // })
} }
}) })
} }
}, },
_submit: async function(ids) {
const result = await meterContract.submitToContractReview(ids)
if (result) {
this._resultChange('提交成功')
}
},
_resultChange(msg) { _resultChange(msg) {
this.$Message.success(msg) this.$Message.success(msg)
this._page() this._page()
...@@ -263,7 +265,7 @@ export default { ...@@ -263,7 +265,7 @@ export default {
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功！') this.$Message.success('删除成功！')
......
pages/meter-contract/contract-register/MeterContractRegisterHis.vue
...@@ -45,15 +45,17 @@ ...@@ -45,15 +45,17 @@
</Row> </Row>
</div> </div>
</div> </div>
<MeterContracHisOperation ref="operationModal"></MeterContracHisOperation>
<FileManage ref="FileManage"></FileManage>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust, meterSubcontractor } from '../../../api' import { meterEntrust, meterContract } from '../../../api'
import MeterContracHisOperation from '../../../components/operation/Operation'
import MeterSubcontractorEdit from './MeterContractRegisterEdit' import MeterSubcontractorEdit from './MeterContractRegisterEdit'
export default { export default {
components: { MeterSubcontractorEdit }, components: { MeterSubcontractorEdit, MeterContracHisOperation },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -67,18 +69,18 @@ export default { ...@@ -67,18 +69,18 @@ export default {
} }
], ],
iconMsg: [ iconMsg: [
{ // {
type: 'ios-clock', // type: 'md-create',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ // {
type: 'ios-clock', // type: 'ios-clock',
id: '', // id: '',
name: '资质项目' // name: '资质项目'
}, // },
{ type: 'ios-clock', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'ios-clock', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
...@@ -155,7 +157,7 @@ export default { ...@@ -155,7 +157,7 @@ export default {
}) })
}, },
_record(id) { _record(id) {
this.$refs.refModal._open(id) this.$refs.operationModal._open(id)
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
...@@ -205,21 +207,23 @@ export default { ...@@ -205,21 +207,23 @@ export default {
}, },
// 追加项目 // 追加项目
_itemModal(data) { _itemModal(data) {
this.$refs.refModal._open(data) // this.$refs.refModal._open(data)
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') // this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterContract.getVOById(id)
console.log(result)
if (result) { if (result) {
this.$refs.editSubcontractorModal._open(result) this.$refs.editSubcontractorModal._openEdit(result)
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功！') this.$Message.success('删除成功！')
......
pages/meter-contract/contract-review/MeterContractReview.vue
...@@ -6,24 +6,24 @@ ...@@ -6,24 +6,24 @@
<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.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @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.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/> <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" 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">
...@@ -51,17 +51,20 @@ ...@@ -51,17 +51,20 @@
<MeterSendOperation ref="operationModal"></MeterSendOperation> <MeterSendOperation ref="operationModal"></MeterSendOperation>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterSubcontractorAddEdit ref="addEditModal" @on-result-change="_page"></MeterSubcontractorAddEdit> <MeterSubcontractorAddEdit ref="addEditModal" @on-result-change="_page"></MeterSubcontractorAddEdit>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract } from '../../../api'
import Reason from '../../../components/base/Reason' import Reason from '../../../components/base/Reason'
import MeterSendOperation from '../MeterContractReviewOperation' import MeterSendOperation from '../MeterContractReviewOperation'
import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterContractReviewEdit' import MeterSubcontractorEdit from './MeterContractReviewEdit'
import MeterSubcontractorAddEdit from './MeterContractReviewAddEdit' import MeterSubcontractorAddEdit from './MeterContractReviewAddEdit'
export default { export default {
components: { components: {
MeterSubcontractorEdit, MeterSubcontractorEdit,
MeterSampleManage,
MeterSendOperation, MeterSendOperation,
MeterSubcontractorAddEdit, MeterSubcontractorAddEdit,
Reason Reason
...@@ -187,6 +190,9 @@ export default { ...@@ -187,6 +190,9 @@ export default {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '查看样品':
this._manageSample(data.id)
break
case '评审': case '评审':
this._reviewContract(data.id) this._reviewContract(data.id)
break break
...@@ -205,6 +211,10 @@ export default { ...@@ -205,6 +211,10 @@ export default {
} }
}) })
}, },
_manageSample(data) {
// 查看样品
this.$refs.meterSampleManageModal._open(data)
},
_submitToReview() { _submitToReview() {
this._submitByContractIds('合同评审') this._submitByContractIds('合同评审')
}, },
...@@ -297,7 +307,7 @@ export default { ...@@ -297,7 +307,7 @@ export default {
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功！') this.$Message.success('删除成功！')
......
pages/meter-contract/contract-review/MeterContractReviewHis.vue
...@@ -45,15 +45,17 @@ ...@@ -45,15 +45,17 @@
</Row> </Row>
</div> </div>
</div> </div>
<MeterReviewHisHisOperation ref="operationModal"></MeterReviewHisHisOperation>
<FileManage ref="FileManage"></FileManage>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust, meterSubcontractor } from '../../../api' import { meterEntrust, meterSubcontractor } from '../../../api'
import MeterReviewHisHisOperation from '../../../components/operation/Operation'
import MeterSubcontractorEdit from './MeterContractReviewEdit' import MeterSubcontractorEdit from './MeterContractReviewEdit'
export default { export default {
components: { MeterSubcontractorEdit }, components: { MeterSubcontractorEdit, MeterReviewHisHisOperation },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -67,18 +69,18 @@ export default { ...@@ -67,18 +69,18 @@ export default {
} }
], ],
iconMsg: [ iconMsg: [
{ // {
type: 'ios-clock', // type: 'md-create',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ // {
type: 'ios-clock', // type: 'ios-clock',
id: '', // id: '',
name: '资质项目' // name: '资质项目'
}, // },
{ type: 'ios-clock', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'ios-clock', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
...@@ -155,7 +157,7 @@ export default { ...@@ -155,7 +157,7 @@ export default {
}) })
}, },
_record(id) { _record(id) {
this.$refs.refModal._open(id) this.$refs.operationModal._open(id)
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
...@@ -202,12 +204,13 @@ export default { ...@@ -202,12 +204,13 @@ export default {
}, },
// 追加项目 // 追加项目
_itemModal(data) { _itemModal(data) {
this.$refs.refModal._open(data) // this.$refs.refModal._open(data)
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') // this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterSubcontractor.getById(id)
......
pages/meter-entrust/client-online/MeterClientOnlineEntrustHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-entrust/go-out-test/EditModal.vue
...@@ -118,11 +118,8 @@ export default { ...@@ -118,11 +118,8 @@ export default {
_page: async function() { _page: async function() {
const result = await meterManage.page(this._searchParams()) const result = await meterManage.page(this._searchParams())
if (result) { if (result) {
console.log('查询结果')
console.log(result)
this.getPage = result.records this.getPage = result.records
this.loading = false this.loading = false
console.log(this.getPage)
} }
}, },
_pageChange(page) { _pageChange(page) {
......
pages/meter-entrust/go-out-test/MeterGoOutEntrustHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-entrust/send-test/EditModal.vue
...@@ -118,11 +118,8 @@ export default { ...@@ -118,11 +118,8 @@ export default {
_page: async function() { _page: async function() {
const result = await meterManage.page(this._searchParams()) const result = await meterManage.page(this._searchParams())
if (result) { if (result) {
console.log('查询结果')
console.log(result)
this.getPage = result.records this.getPage = result.records
this.loading = false this.loading = false
console.log(this.getPage)
} }
}, },
_pageChange(page) { _pageChange(page) {
......
pages/meter-entrust/send-test/MeterSendEntrustHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-out/personal-task/InstrumentEdit.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<p slot="header">仪器领用</p> <p slot="header">仪器领用</p>
<Form :label-width="60" onsubmit="return false" inline> <Form :label-width="60" onsubmit="return false" inline>
<Form-item label="仪器名称"> <Form-item label="仪器名称">
<Input v-model="name" placeholder="请输入仪器名称,回车查询" icon="ios-search-strong" <Input v-model="formObj.name" placeholder="请输入仪器名称,回车查询" icon="ios-search-strong"
@on-enter="_search"/> @on-enter="_search"/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
......
pages/meter-out/personal-task/MeterOutPersonalTaskHis.vue
...@@ -45,15 +45,17 @@ ...@@ -45,15 +45,17 @@
</Row> </Row>
</div> </div>
</div> </div>
<operationModal ref="operationModal" @on-result-change="_page"></operationModal>
<FileManage ref="FileManage" @on-result-change="_page"></FileManage>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust } from '../../../api' import { meterEntrust, meterSample } from '../../../api'
import operationModal from '../../../components/operation/Operation'
import MeterSubcontractorEdit from './MeterGoOutTestEdit' import MeterSubcontractorEdit from './MeterGoOutTestEdit'
export default { export default {
components: { MeterSubcontractorEdit }, components: { MeterSubcontractorEdit, operationModal },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -77,17 +79,17 @@ export default { ...@@ -77,17 +79,17 @@ export default {
// id: '', // id: '',
// name: '编辑' // name: '编辑'
// }, // },
{ // {
type: 'ios-beaker', // type: 'ios-beaker',
id: '', // id: '',
name: '管理样品' // name: '管理样品'
}, // },
{ type: 'md-cloud', id: '', name: '附件' }, // { type: 'md-cloud', id: '', name: '附件' },
{ // {
type: 'ios-clock', // type: 'ios-clock',
id: '', // id: '',
name: '操作日志' // name: '操作日志'
} // }
], ],
formObj: { formObj: {
name: undefined, name: undefined,
...@@ -96,16 +98,22 @@ export default { ...@@ -96,16 +98,22 @@ export default {
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '证书是否编制', key: 'onlineReported', width: 120 },
{ title: '证书编号', key: 'reportCode', width: 130 },
{ title: '型号规格', key: 'spec', width: 120 },
{ title: '出厂编号', key: 'factoryNumber', width: 120 },
{ title: '检测类型', key: 'type', width: 100 },
{ title: '温度', key: 'temperature', width: 100 },
{ title: '湿度', key: 'humidity', width: 100 },
{ title: '地点', key: 'place', width: 100 },
{ title: '其他', key: 'cElse', width: 100 },
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' }, { title: '数量', key: 'quantity' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
...@@ -163,6 +171,9 @@ export default { ...@@ -163,6 +171,9 @@ export default {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '查看样品':
this._manageSample(data.id)
break
case '编辑': case '编辑':
this._editModal(true, data.id) this._editModal(true, data.id)
break break
...@@ -181,8 +192,12 @@ export default { ...@@ -181,8 +192,12 @@ export default {
} }
}) })
}, },
_manageSample(data) {
// 查看样品
// this.$refs.meterSampleManageModal._open(data)
},
_record(id) { _record(id) {
this.$refs.refModal._open(id) this.$refs.operationModal._open(id)
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
...@@ -203,7 +218,7 @@ export default { ...@@ -203,7 +218,7 @@ export default {
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj) console.log('this.formObj', this.formObj)
const result = await meterEntrust.pageGoOutEntrust(this.formObj) const result = await meterSample.pageOutPersonalTask(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
...@@ -239,7 +254,7 @@ export default { ...@@ -239,7 +254,7 @@ export default {
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterEntrust.getVOById(id) const result = await meterEntrust.getVOById(id)
......
pages/meter-out/task-distribute/MeterOutTaskDistributeHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -71,17 +73,17 @@ export default { ...@@ -71,17 +73,17 @@ export default {
// id: '', // id: '',
// name: '编辑' // name: '编辑'
// }, // },
{ // {
type: 'ios-contact', // type: 'ios-contact',
id: '', // id: '',
name: '任务分配' // name: '任务分配'
}, // },
{ type: 'md-cloud', id: '', name: '附件' }, // { type: 'md-cloud', id: '', name: '附件' },
{ // {
type: 'ios-clock', // type: 'ios-clock',
id: '', // id: '',
name: '操作日志' // name: '操作日志'
} // }
], ],
formObj: { formObj: {
client: undefined, client: undefined,
......
pages/meter-progress/progress-sample/MeterSampleProgress.vue
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</div> </div>
</div> </div>
<!-- 添加、编辑 --> <!-- 添加、编辑 -->
<MeterAptitudeStandardEdit ref="editModal" @on-result-change="_page"></MeterAptitudeStandardEdit> <!-- <MeterAptitudeStandardEdit ref="editModal" @on-result-change="_page"></MeterAptitudeStandardEdit>-->
<!--导入资质项目--> <!--导入资质项目-->
<!-- <DownloadTemplateImport ref="sampleModal" @on-result-change="_page"></DownloadTemplateImport>--> <!-- <DownloadTemplateImport ref="sampleModal" @on-result-change="_page"></DownloadTemplateImport>-->
</div> </div>
......
pages/meter-send/receive-sample/MeterReceiveEntrustHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-send/receive-sample/MeterSampleManage.vue
...@@ -10,24 +10,24 @@ ...@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false"> <Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="样品名称:" class="search-item"> <Form-item label="样品名称:" class="search-item">
<Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/> <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange"> :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -77,6 +77,7 @@ export default { ...@@ -77,6 +77,7 @@ export default {
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
searchOpen: false,
// btn: [ // btn: [
// {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'}, // {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},
// {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'}, // {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'},
......
pages/meter-send/receive-sample/MeterSampleReceiveHis.vue
...@@ -10,24 +10,24 @@ ...@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false"> <Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="样品名称:" class="search-item"> <Form-item label="样品名称:" class="search-item">
<Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/> <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange"> :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -79,6 +79,7 @@ export default { ...@@ -79,6 +79,7 @@ export default {
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
searchOpen: false,
// btn: [ // btn: [
// {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'}, // {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},
// {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'}, // {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'},
......
pages/meter-send/sample-flow/MeterSampleFlowHis.vue
...@@ -45,13 +45,15 @@ ...@@ -45,13 +45,15 @@
</Row> </Row>
</div> </div>
</div> </div>
<Operation ref="Operation"></Operation>
<FileManage ref="FileManage" @on-result-change="_page"></FileManage>
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust } from '../../../api' import { meterEntrust } from '../../../api'
import Operation from '../../../components/operation/Operation'
export default { export default {
components: {}, components: { Operation },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -70,16 +72,16 @@ export default { ...@@ -70,16 +72,16 @@ export default {
} }
], ],
iconMsg: [ iconMsg: [
{ // {
type: 'md-create', // type: 'md-create',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ // {
type: 'ios-beaker', // type: 'ios-beaker',
id: '', // id: '',
name: '管理样品' // name: '管理样品'
}, // },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
{ {
...@@ -181,7 +183,8 @@ export default { ...@@ -181,7 +183,8 @@ export default {
}) })
}, },
_record(id) { _record(id) {
this.$refs.refModal._open(id) // this.$refs.refModal._open(id)
this.$refs.Operation._open(id)
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
...@@ -238,12 +241,12 @@ export default { ...@@ -238,12 +241,12 @@ export default {
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterEntrust.getVOById(id) const result = await meterEntrust.getVOById(id)
if (result) { if (result) {
this.$refs.editSubcontractorModal._openEdit(result) // this.$refs.editSubcontractorModal._openEdit(result)
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
......
pages/meter-send/sample-input/MeterSampleInputHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -45,15 +47,17 @@ ...@@ -45,15 +47,17 @@
</Row> </Row>
</div> </div>
</div> </div>
<Operation ref="Operation"></Operation>
<FileManage ref="FileManage"></FileManage>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust } from '../../../api' import { meterEntrust } from '../../../api'
import Operation from '../../../components/operation/Operation'
import MeterSubcontractorEdit from './MeterGoOutTestEdit' import MeterSubcontractorEdit from './MeterGoOutTestEdit'
export default { export default {
components: { MeterSubcontractorEdit }, components: { MeterSubcontractorEdit, Operation },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -72,16 +76,16 @@ export default { ...@@ -72,16 +76,16 @@ export default {
} }
], ],
iconMsg: [ iconMsg: [
{ // {
type: 'md-create', // type: 'md-create',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ // {
type: 'ios-beaker', // type: 'ios-beaker',
id: '', // id: '',
name: '管理样品' // name: '管理样品'
}, // },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
{ {
...@@ -183,7 +187,8 @@ export default { ...@@ -183,7 +187,8 @@ export default {
}) })
}, },
_record(id) { _record(id) {
this.$refs.refModal._open(id) // this.$refs.refModal._open(id)
this.$refs.Operation._open(id)
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
...@@ -240,7 +245,8 @@ export default { ...@@ -240,7 +245,8 @@ export default {
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') // this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterEntrust.getVOById(id) const result = await meterEntrust.getVOById(id)
......
pages/meter-send/task-distribute/MeterTaskDistribute.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-send/task-distribute/MeterTaskDistributeHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-statistics/annual-entrust/MeterAnnualEntrust.vue
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
</Form-item> </Form-item>
</Form> </Form>
</div> </div>
<div class="fr">
<Button class="width-80" @click="_export">导出</Button>
</div>
<div class="clear"></div> <div class="clear"></div>
</Col> </Col>
<!--内容--> <!--内容-->
......
pages/meter-statistics/certificate-rate/MeterCertificateRate.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="fl"> <div class="fl">
<Form id="search-form" :label-width="100" inline onsubmit="return false"> <Form id="search-form" :label-width="100" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="应出报告日期:"> <Form-item label="应出证书日期:">
<!--<DatePicker type="month" style="width:90px" v-model="startDate" @on-change="_beginDateChange"--> <!--<DatePicker type="month" style="width:90px" v-model="startDate" @on-change="_beginDateChange"-->
<!--:editable="false"></DatePicker>--> <!--:editable="false"></DatePicker>-->
<!--<label class="line-color">——</label>--> <!--<label class="line-color">——</label>-->
...@@ -16,23 +16,20 @@ ...@@ -16,23 +16,20 @@
<!--@on-change="_endDateChange"></DatePicker>--> <!--@on-change="_endDateChange"></DatePicker>-->
<el-date-picker <el-date-picker
v-model="queryDate" v-model="queryDate"
@change="_dateChange"
type="monthrange" type="monthrange"
range-separator="-" range-separator="-"
start-placeholder="开始月份" start-placeholder="开始月份"
end-placeholder="结束月份" end-placeholder="结束月份"
size="small" size="small"
value-format="yyyy-MM" value-format="yyyy-MM">
@change="_dateChange">
</el-date-picker> </el-date-picker>
</Form-item> </Form-item>
<Form-item class="marginLeft-70" style="margin-left: -60px;"> <Form-item class="marginLeft-70" style="margin-left: -60px;">
<Button type="primary" class="width-80" @click="_getData">搜索</Button> <Button @click="_getData" type="primary" class="width-80">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</div> </div>
<div class="fr">
<Button class="width-80" @click="_export">导出</Button>
</div>
<div class="clear"></div> <div class="clear"></div>
</Col> </Col>
<!--内容--> <!--内容-->
...@@ -87,12 +84,20 @@ export default { ...@@ -87,12 +84,20 @@ export default {
} }
}, },
mounted() { mounted() {
const str = this.tempData.endDate
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.forObject.edateBegin = this.tempData.beginDate this.forObject.edateBegin = this.tempData.beginDate
this.forObject.edateEnd = this.tempData.endDate // this.forObject.edateEnd = this.tempData.endDate
this.forObject.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this._getData() this._getData()
// this._search(); // this._search();
}, },
methods: { methods: {
mGetDate(year, month) {
const d = new Date(year, month, 1)
return d
},
_dateChange(data) { _dateChange(data) {
if (data) { if (data) {
this.tempData.beginDate = data[0] this.tempData.beginDate = data[0]
...@@ -101,13 +106,20 @@ export default { ...@@ -101,13 +106,20 @@ export default {
this.pieData.endDate = data[1] this.pieData.endDate = data[1]
this.forObject.edateBegin = data[0] this.forObject.edateBegin = data[0]
this.forObject.edateEnd = data[1] this.forObject.edateEnd = data[1]
const str = data[1]
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.forObject.edateEnd = this.$dateformat(
lastday,
'yyyy-mm-dd HH:MM:ss'
)
} else { } else {
this.tempData.beginDate = '' this.tempData.beginDate = ''
this.tempData.endDate = '' this.tempData.endDate = ''
this.pieData.beginDate = '' this.pieData.beginDate = ''
this.pieData.endDate = '' this.pieData.endDate = ''
this.forObject.edateBegin = '' this.forObject.edateBegin = undefined
this.forObject.edateEnd = '' this.forObject.edateEnd = undefined
} }
this.$refs.contractTableModal._changeDate(this.tempData) this.$refs.contractTableModal._changeDate(this.tempData)
}, },
...@@ -131,8 +143,8 @@ export default { ...@@ -131,8 +143,8 @@ export default {
}, },
_search() { _search() {
this.$refs.contractTableModal._searchTable({ this.$refs.contractTableModal._searchTable({
beginDate: this.tempData.beginDate, beginDate: this.forObject.edateBegin,
endDate: this.tempData.endDate endDate: this.forObject.edateEnd
}) })
// this.$refs.contractPieModal._searchPie({ // this.$refs.contractPieModal._searchPie({
// beginDate: this.pieData.beginDate, // beginDate: this.pieData.beginDate,
......
pages/meter-statistics/certificate-rate/ReportTimelyTable.vue
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
} }
}, },
mounted() { mounted() {
this._page() // this._page()
}, },
methods: { methods: {
// 日期变化时，将时间赋值，导出根据查询条件 // 日期变化时，将时间赋值，导出根据查询条件
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
$('input[name=endDate]').val(data.endDate) $('input[name=endDate]').val(data.endDate)
$('input[name=warningDate]').val(data.warningDate) $('input[name=warningDate]').val(data.warningDate)
$('input[name=type]').val('') $('input[name=type]').val('')
this._page() // this._page()
}, },
_searchTable(data) { _searchTable(data) {
$('input[name=beginDate]').val(data.beginDate) $('input[name=beginDate]').val(data.beginDate)
......
pages/meter-statistics/customer-entrust/MeterCustomerEntrust.vue
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
</Form-item> </Form-item>
</Form> </Form>
</div> </div>
<div class="fr">
<Button @click="_exportSampleForm" class="width-80">导出</Button>
</div>
<div class="clear"></div> <div class="clear"></div>
</Col> </Col>
<!--内容--> <!--内容-->
...@@ -122,18 +119,23 @@ export default { ...@@ -122,18 +119,23 @@ export default {
}, },
mounted() { mounted() {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
const str = this.tempData.endDate
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
// this._contHide() // this._contHide()
// this._getUserGroup() // this._getUserGroup()
this.formObj.edateBegin = this.tempData.beginDate this.formObj.edateBegin = this.tempData.beginDate
this.formObj.edateEnd = this.tempData.endDate this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this._getData() this._getData()
// this._getServiceTypeList() // this._getServiceTypeList()
}, },
methods: { methods: {
mGetDate(year, month) {
const d = new Date(year, month, 1)
return d
},
// 服务类型 // 服务类型
_getData: async function() { _getData: async function() {
this.formObj.edateBegin = this.queryDate[0]
this.formObj.edateEnd = this.queryDate[1]
console.log('753951') console.log('753951')
console.log('选择时间后的请求', this.formObj) console.log('选择时间后的请求', this.formObj)
const result = await meterSample.pageCustomerEntrustStatistics( const result = await meterSample.pageCustomerEntrustStatistics(
...@@ -159,9 +161,15 @@ export default { ...@@ -159,9 +161,15 @@ export default {
if (data) { if (data) {
this.formObj.edateBegin = data[0] this.formObj.edateBegin = data[0]
this.formObj.edateEnd = data[1] this.formObj.edateEnd = data[1]
const str = data[1]
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
} else { } else {
this.tempData.edateBegin = '' this.tempData.edateBegin = ''
this.tempData.edateEnd = '' this.tempData.edateEnd = ''
this.formObj.edateBegin = undefined
this.formObj.edateEnd = undefined
} }
}, },
_contHide() { _contHide() {
......
pages/meter-statistics/personal-task/MeterPersonalTask.vue
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
</Form-item> </Form-item>
</Form> </Form>
</div> </div>
<div class="fr">
<Button class="width-80" @click="_exportSampleForm">导出</Button>
</div>
<div class="clear"></div> <div class="clear"></div>
</Col> </Col>
<!--内容--> <!--内容-->
...@@ -154,12 +151,19 @@ export default { ...@@ -154,12 +151,19 @@ export default {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
// this._contHide() // this._contHide()
// this._getUserGroup() // this._getUserGroup()
const str = this.tempData.endDate
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateBegin = this.tempData.beginDate this.formObj.edateBegin = this.tempData.beginDate
this.formObj.edateEnd = this.tempData.endDate this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
this._getData() this._getData()
// this._getServiceTypeList() // this._getServiceTypeList()
}, },
methods: { methods: {
mGetDate(year, month) {
const d = new Date(year, month, 1)
return d
},
// 服务类型 // 服务类型
_getData: async function() { _getData: async function() {
const result = await meterSample.pagePersonalTaskStatistics(this.formObj) const result = await meterSample.pagePersonalTaskStatistics(this.formObj)
...@@ -184,7 +188,10 @@ export default { ...@@ -184,7 +188,10 @@ export default {
this.tempData.beginDate = data[0] this.tempData.beginDate = data[0]
this.tempData.endDate = data[1] this.tempData.endDate = data[1]
this.formObj.edateBegin = data[0] this.formObj.edateBegin = data[0]
this.formObj.edateEnd = data[1] const str = data[1]
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
} else { } else {
this.tempData.beginDate = '' this.tempData.beginDate = ''
this.tempData.endDate = '' this.tempData.endDate = ''
......
pages/meter-statistics/sample-quantity/MeterSampleQuantity.vue
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
</Form-item> </Form-item>
</Form> </Form>
</div> </div>
<div class="fr">
<Button @click="_exportSampleForm" class="width-80">导出</Button>
</div>
<div class="clear"></div> <div class="clear"></div>
</Col> </Col>
<!--内容--> <!--内容-->
...@@ -142,14 +139,21 @@ export default { ...@@ -142,14 +139,21 @@ export default {
}, },
mounted() { mounted() {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
const str = this.tempData.endDate
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateBegin = this.tempData.beginDate this.formObj.edateBegin = this.tempData.beginDate
this.formObj.edateEnd = this.tempData.endDate this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
// this._contHide() // this._contHide()
// this._getUserGroup() // this._getUserGroup()
this._getData() this._getData()
// this._getServiceTypeList() // this._getServiceTypeList()
}, },
methods: { methods: {
mGetDate(year, month) {
const d = new Date(year, month, 1)
return d
},
// 服务类型 // 服务类型
_getData: async function() { _getData: async function() {
const result = await meterSample.pageSampleQuantityStatistics( const result = await meterSample.pageSampleQuantityStatistics(
...@@ -176,7 +180,10 @@ export default { ...@@ -176,7 +180,10 @@ export default {
this.tempData.beginDate = data[0] this.tempData.beginDate = data[0]
this.tempData.endDate = data[1] this.tempData.endDate = data[1]
this.formObj.edateBegin = data[0] this.formObj.edateBegin = data[0]
this.formObj.edateEnd = data[1] const str = data[1]
const arr = str.split('-')
const lastday = this.mGetDate(arr[0], arr[1]).getTime() - 1
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
} else { } else {
this.tempData.beginDate = '' this.tempData.beginDate = ''
this.tempData.endDate = '' this.tempData.endDate = ''
......
pages/meter-subcontract/cannot-sub/MeterCannotSub.vue
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</div> </div>
</template> </template>
<script> <script>
import { meterSubContract, meterSubcontractor } from '../../../api' import { meterSubContract } from '../../../api'
import MeterSubcontractorEdit from './MeterCannotSubEdit' import MeterSubcontractorEdit from './MeterCannotSubEdit'
export default { export default {
components: { MeterSubcontractorEdit }, components: { MeterSubcontractorEdit },
...@@ -242,7 +242,7 @@ export default { ...@@ -242,7 +242,7 @@ export default {
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterSubContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功！') this.$Message.success('删除成功！')
......
pages/meter-subcontract/cannot-sub/MeterCannotSubEdit.vue
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
<div> <div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline> <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
<Form-item label="委托单位" prop="client" class="width-48"> <Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" name="client" <AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange" name="client" placeholder="请输入或选择委托单位"
></AutoComplete> ></AutoComplete>
</Form-item> </Form-item>
<Form-item label="委托时间：" prop="edate" class="width-48"> <Form-item label="委托时间：" prop="edate" class="width-48">
<Date-picker v-model="formObj.edate" type="date" split-panels style="width:100%;" placeholder="请选择委托时间" <Date-picker v-model="formObj.edate" @on-change="_etimeChange" type="date" split-panels style="width:100%;"
@on-change="_etimeChange"></Date-picker> placeholder="请选择委托时间"></Date-picker>
</Form-item> </Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48"> <Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间" <Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
@on-change="_ctimeChange"></Date-picker> placeholder="请选择要求完成时间"></Date-picker>
</Form-item> </Form-item>
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
</Form-item> </Form-item>
<Form-item label="分包时间：" prop="subTime" class="width-48"> <Form-item label="分包时间：" prop="subTime" class="width-48">
<Date-picker v-model="formObj.subTime" type="date" split-panels style="width:100%;" placeholder="请选择分包时间" <Date-picker v-model="formObj.subTime" @on-change="_subTimeChange" type="date" split-panels style="width:100%;"
@on-change="_subTimeChange"></Date-picker> placeholder="请选择分包时间"></Date-picker>
</Form-item> </Form-item>
<Form-item label="分包费用：" prop="subFee" class="width-48"> <Form-item label="分包费用：" prop="subFee" class="width-48">
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
<!--操作--> <!--操作-->
<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 <PTVXETable
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
> >
<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" blur placeholder="请输入或选择样品名称" @click.native="_selectjudgeBasis(scope.$rowIndex)" <el-input v-model="scope.row.name" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur placeholder="请输入或选择样品名称"
></el-input> ></el-input>
</div> </div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
...@@ -106,10 +106,10 @@ ...@@ -106,10 +106,10 @@
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)" > <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)" >
<el-input <el-input
v-model="scope.row.quantity" v-model="scope.row.quantity"
type="number"
placeholder="请输入或选择数量"
@blur="_quantityChange(scope.$rowIndex)" @blur="_quantityChange(scope.$rowIndex)"
@keydown.native="channelInputLimit" @keydown.native="channelInputLimit"
type="number"
placeholder="请输入或选择数量"
/> />
</div> </div>
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
<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>
</Modal> </Modal>
<EditModal ref="EditModal" is-change @on-result-change="_backData" /> <EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal> <importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div> </div>
</template> </template>
<script> <script>
...@@ -299,6 +299,8 @@ export default { ...@@ -299,6 +299,8 @@ export default {
// this.formObj.customer.cname = data // this.formObj.customer.cname = data
} }
}, },
_subTimeChange() {},
_etimeChange() {},
_customerMatch(data) { _customerMatch(data) {
// this.formObj.client = data // this.formObj.client = data
this._getQueryList(data) this._getQueryList(data)
......
pages/meter-subcontract/subpackage-input/MeterSubpackageInput.vue
...@@ -75,11 +75,11 @@ export default { ...@@ -75,11 +75,11 @@ export default {
// } // }
], ],
iconMsg: [ iconMsg: [
{ // {
type: 'md-paper', // type: 'md-paper',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
...@@ -226,9 +226,9 @@ export default { ...@@ -226,9 +226,9 @@ export default {
this.$refs.FileManage._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterEntrust.getVOById(id)
if (result) { if (result) {
this.$refs.editSubcontractorModal._open(result) // this.$refs.editSubcontractorModal._open(result)
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
......
pages/meter-subcontract/subpackage-input/MeterSubpackageInputHis.vue
...@@ -34,7 +34,9 @@ ...@@ -34,7 +34,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue
...@@ -78,11 +78,11 @@ export default { ...@@ -78,11 +78,11 @@ export default {
// } // }
], ],
iconMsg: [ iconMsg: [
{ // {
type: 'md-paper', // type: 'md-paper',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
...@@ -231,9 +231,10 @@ export default { ...@@ -231,9 +231,10 @@ export default {
this.$refs.FileManage._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterEntrust.getVOById(id)
console.log(result)
if (result) { if (result) {
this.$refs.editSubcontractorModal._open(result) // this.$refs.editSubcontractorModal._open(result)
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
......
pages/meter-subcontract/subpackage-task/MeterSubpackageTaskHis.vue
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -45,6 +47,7 @@ ...@@ -45,6 +47,7 @@
</Row> </Row>
</div> </div>
</div> </div>
<FileManage ref="FileManage"></FileManage>
<MeterSubSampleManage ref="subSampleManage" @on-result-change="_page"></MeterSubSampleManage> <MeterSubSampleManage ref="subSampleManage" @on-result-change="_page"></MeterSubSampleManage>
</div> </div>
...@@ -200,7 +203,7 @@ export default { ...@@ -200,7 +203,7 @@ export default {
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterSubcontractor.getById(id) const result = await meterSubcontractor.getById(id)
......
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