Skip to content

P
patzn-cloud-web-back-soil
Commit a6219c3a by wangweidong
Options

合同管理

parent 948d669a
Showing with 133 additions and 289 deletions
api/meter/meter-contract.js
......@@ -93,6 +93,11 @@ export default {
data.remark
)
.then(res => res),
editDTO: data =>
https
.post('meter/v1/contract/edit_quote', JSON.stringify(data))
.then(res => res),
// 业务受理退回
reception: data =>
http
......
pages/meter-business/accepted/MeterContractAccepted.vue
......@@ -107,7 +107,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/accepted/MeterContractAcceptedHis.vue
......@@ -93,7 +93,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-approval/MeterContractApproval.vue
......@@ -107,7 +107,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-approval/MeterContractApprovalHis.vue
......@@ -93,7 +93,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-check-second/MeterContractCheckSecond.vue
......@@ -107,7 +107,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-check-second/MeterContractCheckSecondHis.vue
......@@ -93,7 +93,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-check/MeterContractCheck.vue
......@@ -107,7 +107,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-check/MeterContractCheckHis.vue
......@@ -93,7 +93,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-register/EditModal.vue
......@@ -93,7 +93,9 @@ export default {
pageColumns: [
{ title: '样品名称', key: 'name' },
{ title: '检定依据', key: 'code' },
{ title: '检定依据名称', key: 'basis' }
{ title: '检定依据名称', key: 'basis' },
{ title: '检定周期', key: 'cycle' },
{ title: '价格', key: 'price' }
],
getPage: [],
showUserGroupModal: false,
......@@ -105,7 +107,7 @@ export default {
},
methods: {
_open() {
this.modalTitle = '选择检测依据'
this.modalTitle = '选择授权资质仪器名称'
this.name = ''
this.code = ''
this._judge()
......
pages/meter-business/quote-register/MeterQuoteRegister.vue
......@@ -37,7 +37,11 @@
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<span>{{scope.row[item.key]}}</span>
<div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<div v-else>{{scope.row[item.key]}}</div>
</template>
</vxe-table-column>
</PTVXETable>
......@@ -104,8 +108,7 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '要求完成时间', key: 'odate', width: 120 },
{ title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: '折扣', key: 'discount', width: 120 },
{ title: '总价', key: 'totalPrice', width: 120 },
{ title: '折扣价', key: 'discountPrice', width: 120 },
......
pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue
......@@ -6,8 +6,8 @@
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
<Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
<AutoComplete :value="formObj.client" :down-data="customerData" name="client"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
></AutoComplete>
</Form-item>
<Form-item label="联系人" prop="person" class="width-48">
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" @on-result-change="_cascaderResult" name="tested">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
......@@ -28,8 +28,8 @@
<Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成时间"></Date-picker>
<Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
@on-change="_ctimeChange"></Date-picker>
</Form-item>
<Form-item label="折扣：" prop="discount" class="width-48">
<Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
......@@ -48,8 +48,8 @@
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></btn-list>
</Col>
<Col span="24">
<PTVXETable
......@@ -71,7 +71,7 @@
>
<template slot-scope="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" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)"
></el-input>
</div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
......@@ -82,6 +82,18 @@
<el-input v-model="scope.row.factoryNumber" blur placeholder="请输入或选择出厂编号"
></el-input>
</div>
<div v-if="item.key==='technicalParameter'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.technicalParameter" blur placeholder="请输入技术参数"
></el-input>
</div>
<div v-if="item.key==='manufacturer'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.manufacturer" blur placeholder="请输入生产厂家"
></el-input>
</div>
<div v-if="item.key==='type'" @click.stop="_handleRow(scope)">
<Select v-model="scope.row.type">
<Option v-for="(item,index) in options" :key="item.name" :value="index">
......@@ -89,14 +101,27 @@
</Option>
</Select>
</div>
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)" >
<el-input
v-model="scope.row.quantity"
@keydown.native="channelInputLimit"
type="number"
placeholder="请输入或选择数量"
@blur="_quantityChange(scope.$rowIndex)"
@keydown.native="channelInputLimit"
/>
</div>
<div v-if="item.key==='unit'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.unit" blur placeholder="请输入收费单位"
></el-input>
</div>
<div v-if="item.key==='remark'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.remark" blur placeholder="请输入备注"
></el-input>
</div>
<div v-else-if="item.date">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
</div>
......@@ -112,15 +137,20 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
<EditModal ref="EditModal" is-change @on-result-change="_backData" />
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
</div>
</template>
<script>
/**
* 添加编辑分包商
*/
import { lmsBaseDict, meterEntrust, meterContract } from '../../../api'
import {
lmsBaseDict,
meterEntrust,
meterContract,
meterSampleQuote
} from '../../../api'
import CityNameCascader from '../../../components/base/CityNameCascader'
import AutoComplete from '../../../components/base/AutoCompletes'
import importModal from '../../../components/import/DownloadTemplateImport'
......@@ -154,8 +184,8 @@ export default {
testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
// { type: 'md-create', id: '', name: '编辑' },
{ type: 'md-trash', id: '', name: '删除' }
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -327,13 +357,36 @@ export default {
this.index = index
this.$refs.EditModal._open()
},
_quantityChange(index) {
this.index = index
if (
undefined !== this.getPage.records[this.index].price &&
undefined !== this.getPage.records[this.index].quantity
) {
this.getPage.records[this.index].totalPrice =
this.getPage.records[this.index].quantity *
this.getPage.records[this.index].price
}
},
_backData(data) {
console.log(typeof this.index)
this.getPage.records[this.index].name = data.name
this.getPage.records[this.index].aptitudeId = data.id
console.log('返回的数据')
console.log(data)
console.log(this.getPage.records)
this.getPage.records[this.index].price = data.price
this._priceCal()
},
_priceCal() {
if (
undefined !== this.getPage.records[this.index].price &&
undefined !== this.getPage.records[this.index].quantity
) {
this.getPage.records[this.index].totalPrice =
this.getPage.records[this.index].quantity *
this.getPage.records[this.index].price
}
},
_inputBack(data) {
......@@ -387,10 +440,10 @@ export default {
_import() {
const data = {
importUrl: '/meter/v1/sample_quote/import',
downloadUrl: '/food/v1/excel/template/FoodAptitudeItem',
downloadUrl: '/meter/v1/excel/template/QuotationList',
title: '导入'
}
this.$refs.importModal._open(data, '资质项目管理导入')
this.$refs.importModal._open(data, '报价单导入')
},
// 省 市 区
_cascaderResult(name, data, msg) {
......@@ -443,7 +496,7 @@ export default {
// this._editModal(true, data.id)
break
case '删除':
// this._deleteById(data.id)
this._deleted(data.id)
console.log('点击了删除按钮')
console.log(index)
this.getPage.records.splice(index, 1)
......@@ -454,6 +507,17 @@ export default {
}
},
_deleted(data) {
if (undefined !== data.id) {
this._deleteById(data.id)
}
},
_deleteById: async function(ids) {
const result = await meterSampleQuote.deleteById(ids)
if (result) {
this.$Message.success('删除成功！')
}
},
_selectAptitude(data) {
console.log(data)
},
......@@ -552,8 +616,23 @@ export default {
this.formObj = formObj
this.modalTitle = '报价单编辑'
this._showTime(formObj)
this._showAddress(formObj)
}
},
_showAddress(formObj) {
this.testedCityData = []
if (
formObj.province !== undefined &&
formObj.city !== undefined &&
formObj.county !== undefined
) {
this.testedCityData.push(formObj.province)
this.testedCityData.push(formObj.city)
this.testedCityData.push(formObj.county)
}
},
_openEdit(formObj) {
this._getList()
this.getPage.records = []
......@@ -567,18 +646,6 @@ export default {
this._showAddress(formObj)
this.getPage.records = formObj.sampleList
},
_showAddress(formObj) {
this.testedCityData = []
if (
formObj.province !== undefined &&
formObj.city !== undefined &&
formObj.county !== undefined
) {
this.testedCityData.push(formObj.province)
this.testedCityData.push(formObj.city)
this.testedCityData.push(formObj.county)
}
},
_getList: async function() {
const result = await meterEntrust.pageList()
const list = []
......@@ -624,7 +691,7 @@ export default {
}
},
_edit: async function(data) {
const result = await meterEntrust.editDTO(data)
const result = await meterContract.editDTO(data)
console.log('修改后')
console.log(result)
if (result) {
......
pages/meter-business/quote-register/MeterQuoteRegisterFinish.vue deleted 100644 → 0
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
</Form-item>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
</Col>
<!--表格-->
<Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<span>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div>
</template>
<script>
import { meterEntrust, meterSubcontractor } from '../../../api'
import MeterSubcontractorEdit from './MeterQuoteRegisterEdit'
export default {
components: { MeterSubcontractorEdit },
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
name: '添加'
}
],
iconMsg: [
{
type: 'ios-clock',
id: '',
name: '编辑'
},
{
type: 'ios-clock',
id: '',
name: '资质项目'
},
{ type: 'ios-clock', id: '', name: '附件' },
{ type: 'ios-clock', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ 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' }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
_modalResult() {
if (this.currentComponent === 'FoodSubcontracterEdit') {
this._page()
}
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '添加':
this._editModal(false)
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '编辑':
this._editModal(true, data.id)
break
case '资质项目':
this._itemModal(data.id)
break
case '附件':
this._upload(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
case '操作日志':
this._record(data.id)
break
}
})
},
_record(id) {
this.$refs.refModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodSubcontracter.page
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterEntrust.pageSendEntrust(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
}
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
// 删除
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
// 编辑&添加
_editModal(edit, id) {
if (edit) {
// 编辑
// this.$refs.editSubcontractorModal._open(id)
this._getById(id)
} else {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.refModal._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterSubcontractor.getById(id)
if (result) {
this.$refs.editSubcontractorModal._open(result)
}
},
_delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-business/quote-register/MeterQuoteRegisterHis.vue
......@@ -96,7 +96,6 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
......
pages/meter-business/quote-register/MeterQuoteRegisterIndex.vue
......@@ -2,13 +2,10 @@
<div>
<div class="layout-content-padding">
<div class="layout-content-main">
<el-tabs v-model="activeName">
<el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="待完成" name="wait">
<MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
</el-tab-pane>
<el-tab-pane label="已完成" name="finish">
<MeterSendEntrustFinish ref="finishTabs"></MeterSendEntrustFinish>
</el-tab-pane>
<el-tab-pane label="历史记录" name="his">
<MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis>
</el-tab-pane>
......@@ -20,19 +17,33 @@
<script>
import MeterSendEntrust from './MeterQuoteRegister'
import MeterSendEntrustFinish from './MeterQuoteRegisterFinish'
import MeterSendEntrustHis from './MeterQuoteRegisterHis'
export default {
name: 'MeterSendEntrustIndex',
components: {
MeterSendEntrust,
MeterSendEntrustFinish,
MeterSendEntrustHis
},
data() {
return {
activeName: 'wait'
}
},
mounted() {
this.activeName = 'wait'
this._page()
},
methods: {
_changeTabs(tab, event) {
if (tab.name === 'wait') {
this._page()
} else {
this.$refs.hisTabs._page()
}
},
_page() {
this.$refs.waitTabs._page()
}
}
}
</script>
......
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