meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
liushuai
2019-12-25 19:13:25 +08:00
parent 5ec43bd584
commit 1cedb5e5c7
8 changed files with 103 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/MarketingCenter/ContractCapitalManagement.js
View File

@@ -32,15 +32,14 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
} }
}) })
} }
export function searchTable2(pageCurrent, pageSize, num1) { export function searchTable2(num1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '合同资金管理_分批资金_查询', name: '基础表_合同资金表明细_查询数据',
param: '资金ID=' + num1 + '=int', param: '资金ID=' + num1 + '=int'
Pagination: pageCurrent + '&' + pageSize
} }
}) })
} }

2
src/api/MarketingCenter/ContractInformationManagement.js
View File

@@ -92,7 +92,7 @@ export function editchar() {
data: { data: {
type: '2', type: '2',
name: '合同信息管理_合同信息_编辑', name: '合同信息管理_合同信息_编辑',
param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] + '&合同总额=' + arguments[13]
} }
}) })
} }

12
src/api/PurchasingCenter/OfflineContractSearch.js
View File

@@ -25,3 +25,15 @@ export function searchOfflineContractContent(num) {
} }
}) })
} }
// 打回离线合同
export function back(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_离线合同_打回合同',
param: `离线合同流水号=${num}`
}
})
}

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

210
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -18,9 +18,9 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<el-badge :value="value" :max="99" class="item"> <!--<el-badge :value="value" :max="99" class="item">-->
<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button> <!--<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>-->
</el-badge> <!--</el-badge>-->
</el-card> </el-card>
<el-card> <el-card>
<el-col :span="14"> <el-col :span="14">
@@ -88,40 +88,40 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="60" fixed="right"> <!--<el-table-column label="操作" align="center" width="60" fixed="right">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top"> <!--<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">-->
<div style="display: inline-block"> <!--<div style="display: inline-block">-->
<el-button <!--<el-button-->
:disabled="scope.row.是否禁用编辑" <!--:disabled="scope.row.是否禁用编辑"-->
type="text" <!--type="text"-->
size="mini" <!--size="mini"-->
icon="el-icon-edit-outline" <!--icon="el-icon-edit-outline"-->
@click.stop="EditTableData(scope.row)"/> <!--@click.stop="EditTableData(scope.row)"/>-->
</div> <!--</div>-->
</el-tooltip> <!--</el-tooltip>-->
<el-tooltip :open-delay="1000" effect="dark" content="新增发票" placement="top"> <!--<el-tooltip :open-delay="1000" effect="dark" content="新增发票" placement="top">-->
<div style="display: inline-block"> <!--<div style="display: inline-block">-->
<el-button <!--<el-button-->
:disabled="scope.row.是否禁用编辑" <!--:disabled="scope.row.是否禁用编辑"-->
type="text" <!--type="text"-->
size="mini" <!--size="mini"-->
icon="el-icon-circle-plus-outline" <!--icon="el-icon-circle-plus-outline"-->
@click.stop="EditTableData(scope.row)"/> <!--@click.stop="EditTableData(scope.row)"/>-->
</div> <!--</div>-->
</el-tooltip> <!--</el-tooltip>-->
<!--<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">--> <!--&lt;!&ndash;<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">&ndash;&gt;-->
<!--<div style="display: inline-block">--> <!--&lt;!&ndash;<div style="display: inline-block">&ndash;&gt;-->
<!--<el-button--> <!--&lt;!&ndash;<el-button&ndash;&gt;-->
<!--style="margin-left: 20px"--> <!--&lt;!&ndash;style="margin-left: 20px"&ndash;&gt;-->
<!--size="mini"--> <!--&lt;!&ndash;size="mini"&ndash;&gt;-->
<!--type="text"--> <!--&lt;!&ndash;type="text"&ndash;&gt;-->
<!--icon="el-icon-delete"--> <!--&lt;!&ndash;icon="el-icon-delete"&ndash;&gt;-->
<!--@click.stop="dellist(scope.row)"/>--> <!--&lt;!&ndash;@click.stop="dellist(scope.row)"/>&ndash;&gt;-->
<!--</div>--> <!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--</el-tooltip>--> <!--&lt;!&ndash;</el-tooltip>&ndash;&gt;-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination
@@ -136,109 +136,37 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-table <el-table
v-loading="listLoading2"
:row-style="tableRowClassName1"
:row-key="getRowKeys1"
:expand-row-keys="expands1"
:data="tableData2" :data="tableData2"
style="width: 100%;max-height: 440px;text-align: center" style="width: 100%;max-height: 440px;text-align: center"
height="210" height="210"
highlight-current-row highlight-current-row
border border
stripe stripe
size="mini" size="mini">
@expand-change="selectMachine1">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData4" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
<el-table-column
align="center"
label="序号"
type="index"
width="100"/>
<el-table-column label="本次收款金额" align="center">
<template slot-scope="scope">
{{ scope.row.本次收款金额 }}
</template>
</el-table-column>
<el-table-column label="本次收款时间" align="center">
<template slot-scope="scope">
{{ scope.row.本次收款时间 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="110">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
icon="el-icon-edit-outline"
@click="handleEdit2(scope.row);flag = 2"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
style="margin-left: 20px"
icon="el-icon-delete"
@click="handleDelete2(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="付款批次" label="序号"
type="index" type="index"
width="70"/> width="100"/>
<el-table-column align="center" label="应收金额（万元）" width="118px"> <el-table-column label="收款金额" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.应收金额 }} {{ scope.row.金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="已收金额（万元）" width="118px"> <el-table-column label="收款时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.已收金额 }} {{ scope.row.入账时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="收款阶段" min-width="169px"> <el-table-column label="操作" fixed="right" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)"> <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<el-option
v-for="item in plannedTime"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="110">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button <el-button
:disabled="scope.row.是否禁用收款"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-money" icon="el-icon-edit-outline"
@click="handleEdit1(scope.row);flag=1"/> @click="handleEdit2(scope.row);flag = 2"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="收款转移" placement="top">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="text"
style="margin-left: 20px"
icon="el-icon-sort"
@click="TransferPlan(scope.row)"/>
</div> </div>
</el-tooltip> </el-tooltip>
</template> </template>
@@ -941,47 +869,9 @@ export default {
}) })
}, },
getTableData2(row) { getTableData2(row) {
this.timetime = row.合同签订日期
this.moneyID = row.资金id this.moneyID = row.资金id
this.max = parseFloat(row.未支付金额) searchTable2(this.moneyID).then(response => {
this.contractTotal = parseFloat(row.合同总金额) this.tableData2 = response.data
this.listLoading2 = true
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
this.id3 = ''
this.listLoading2 = false
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].执行进度id = parseInt(data[i].执行进度id)
if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
}
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].是否禁用收款 = true
data[i].状态 = '进度未完'
} else {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].是否禁用收款 = true
data[i].状态 = '已完成'
} else {
if (data[i].状态 === '0') {
data[i].状态 = '未开始'
}
if (data[i].状态 === '1') {
data[i].状态 = '即将拖期'
}
if (data[i].状态 === '2') {
data[i].状态 = '已拖期'
}
}
}
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableData2 = data
this.total2 = response.data.total
}) })
}, },
handleSizeChange(val) { handleSizeChange(val) {

8
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -119,7 +119,7 @@
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同总额" prop="合同总额" width="140" show-overflow-tooltip> <el-table-column align="right" label="合同总额(万元)" prop="合同总额" width="140" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ Number(scope.row.合同总金额).toFixed(2) }} {{ Number(scope.row.合同总金额).toFixed(2) }}
</template> </template>
@@ -289,7 +289,7 @@
<el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/> <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-show="isTrue" :span="12"> <el-col :span="12">
<el-form-item label="合同总额" prop="contractAmount"> <el-form-item label="合同总额" prop="contractAmount">
<el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/> <el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
</el-form-item> </el-form-item>
@@ -367,7 +367,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="付款方式" prop="付款方式"> <el-form-item label="付款方式" prop="付款方式">
<el-select v-model="form.付款方式" :disabled="disabled" placeholder="请选择付款方式" size="small" style="width: 200px"> <el-select v-model="form.付款方式" placeholder="请选择付款方式" size="small" style="width: 200px">
<el-option <el-option
v-for="item in money" v-for="item in money"
:key="item.value" :key="item.value"
@@ -998,7 +998,7 @@ export default {
this.isTrue = false this.isTrue = false
}, },
chaEdit() { chaEdit() {
editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => { editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => {
this.dialogFormVisible1 = false this.dialogFormVisible1 = false
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('信息更新成功') this.$message.success('信息更新成功')

8
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -543,7 +543,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商名称" prop="供应商名称"> <el-form-item label="供应商名称" prop="供应商名称">
<el-select v-model="form2.供应商名称" style="width:150px" placeholder="供应商" size="small" filterable> <el-select v-model="form2.供应商流水号" style="width:150px" placeholder="供应商" size="small" filterable>
<el-option <el-option
v-for="item in supplierNames" v-for="item in supplierNames"
:key="item.value" :key="item.value"
@@ -823,6 +823,7 @@ export default {
created() { created() {
this.getPerson() this.getPerson()
this.projectChange() this.projectChange()
this.getSupplier1()
// this.searchTable2() // this.searchTable2()
this.searchTable11() this.searchTable11()
this.initDirection() this.initDirection()
@@ -1082,7 +1083,6 @@ export default {
if (this.$refs['form2'] !== undefined) { if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields() this.$refs['form2'].resetFields()
} }
this.getSupplier1()
this.title2 = '创建离线合同' this.title2 = '创建离线合同'
getBillNum().then(response => { // 查询询价单号 getBillNum().then(response => { // 查询询价单号
this.form2.离线合同编号 = response.data[0].单号 this.form2.离线合同编号 = response.data[0].单号
@@ -1095,8 +1095,6 @@ export default {
}) })
}, },
getSupplier1() { getSupplier1() {
this.supplierNames = []
this.form2.供应商名称 = ''
searchSupplier1(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => { searchSupplier1(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.supplierNames.push({ this.supplierNames.push({
@@ -1142,7 +1140,7 @@ export default {
this.form2.离线合同流水号 = row.离线合同流水号 this.form2.离线合同流水号 = row.离线合同流水号
this.form2.离线合同编号 = row.离线合同编号 this.form2.离线合同编号 = row.离线合同编号
this.form2.离线合同名称 = row.离线合同名称 this.form2.离线合同名称 = row.离线合同名称
this.form2.供应商流水号 = row.供应商流水号 this.form2.供应商流水号 = parseInt(row.供应商流水号)
this.form2.供应商名称 = row.供应商名称 this.form2.供应商名称 = row.供应商名称
this.form2.规定到货时间 = row.规定到货时间 this.form2.规定到货时间 = row.规定到货时间
this.form2.离线合同备注 = row.离线合同备注 this.form2.离线合同备注 = row.离线合同备注

30
src/views/PurchasingCenter/OfflineContractSearch/index.vue
View File

@@ -11,6 +11,12 @@
icon="el-icon-search" icon="el-icon-search"
style="margin-left:10px" style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button
type="danger"
size="small"
icon="el-icon-back"
style="margin-left:10px"
@click="back">打回</el-button>
</el-row> </el-row>
</div> </div>
</el-card> </el-card>
@@ -109,7 +115,7 @@
</template> </template>
<script> <script>
import { searchOfflineContract, searchOfflineContractContent } from '@/api/PurchasingCenter/OfflineContractSearch' import { searchOfflineContract, searchOfflineContractContent, back } from '@/api/PurchasingCenter/OfflineContractSearch'
import QRCode from 'qrcode' import QRCode from 'qrcode'
import $ from 'jquery' import $ from 'jquery'
export default { export default {
@@ -119,6 +125,7 @@ export default {
contractNumber: '', contractNumber: '',
supplierName: '', supplierName: '',
total1: 0, total1: 0,
number: '',
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 20, pageSize1: 20,
tableData1: [], tableData1: [],
@@ -152,7 +159,28 @@ export default {
this.pageCurrent1 = val this.pageCurrent1 = val
this.searchTable1() this.searchTable1()
}, },
back() {
this.$confirm('确定打回合同?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.number) {
back(this.number).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('打回成功')
this.searchTable1()
} else {
this.$message.success('打回失败')
}
})
} else {
this.$message.warning('请选择要打回的合同')
}
})
},
searchTable2(row) { searchTable2(row) {
this.number = row.离线合同流水号
searchOfflineContractContent(row.离线合同流水号).then(response => { searchOfflineContractContent(row.离线合同流水号).then(response => {
this.contractDetail = response.data this.contractDetail = response.data
this.showOffline(row) this.showOffline(row)