结算页面善，接口调试完成，本周bug修复
This commit is contained in:
BianLzhaoMin
parent
2ed7eab8a4
commit
e36dd31294
|
|
@ -73,7 +73,12 @@ export const submitFeeBearApi = (params) => {
|
|||
}
|
||||
/** 获取月结记录接口*/
|
||||
export const getMonthRecordApi = (params) => {
|
||||
return request.post('/material//sltAgreementInfo/getSltInfoMonth', params)
|
||||
return request.post('/material/sltAgreementInfo/getSltInfoMonth', params)
|
||||
}
|
||||
|
||||
/** 确认结算接口所有结算*/
|
||||
export const submitAllFeeBearApi = (params) => {
|
||||
return request.post('/material/sltAgreementInfo/submitFee', params)
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@
|
|||
<div class="row-header">
|
||||
<div>领用单位：{{ currRowInfo.unitName }}</div>
|
||||
<div>工程名称：{{ currRowInfo.projectName }}</div>
|
||||
<div>总合计：xxxxx元</div>
|
||||
<div>总合计：{{ totalAmount }}元</div>
|
||||
<div>
|
||||
<el-button size="mini" type="primary">导出全部明细表</el-button>
|
||||
<el-button size="mini" type="primary" @click="handleExportAll()"
|
||||
>导出全部明细表</el-button
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 01承担方 -->
|
||||
|
|
@ -46,8 +48,10 @@
|
|||
:isRepair="true"
|
||||
:totalPrice="repairTotalPrice"
|
||||
:tableData="repairTableData"
|
||||
:currRowInfo="currRowInfo"
|
||||
:listType="3"
|
||||
@handleExport="handleExport"
|
||||
@onChangeRepairPrice="onChangeRepairPrice"
|
||||
/>
|
||||
<FinishTable
|
||||
:tableColumns="noReturnTableColumns"
|
||||
|
|
@ -74,7 +78,11 @@
|
|||
/>
|
||||
|
||||
<el-row class="submit-btn">
|
||||
<el-button size="mini" type="primary" @click="submitComSett"
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
@click="submitComSett"
|
||||
v-if="currRowInfo.isSlt == 0"
|
||||
>确认完工结算</el-button
|
||||
>
|
||||
</el-row>
|
||||
|
|
@ -84,7 +92,11 @@
|
|||
<script>
|
||||
import PageHeader from '@/components/pageHeader'
|
||||
import FinishTable from './finishTable.vue'
|
||||
import { getComSellQueryApi, submitFeeBearApi } from '@/api/cost/cost.js'
|
||||
import {
|
||||
getComSellQueryApi,
|
||||
submitFeeBearApi,
|
||||
submitAllFeeBearApi,
|
||||
} from '@/api/cost/cost.js'
|
||||
export default {
|
||||
components: {
|
||||
PageHeader,
|
||||
|
|
@ -102,13 +114,24 @@ export default {
|
|||
default: () => null,
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
totalAmount() {
|
||||
return (
|
||||
this.settleTotalPrice_01 * 1 +
|
||||
this.settleTotalPrice_03 * 1 +
|
||||
this.repairTotalPrice * 1 +
|
||||
this.noReturnTotalPrice * 1 +
|
||||
this.scrapTotalPrice * 1
|
||||
)
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 结算清单配置项
|
||||
settleTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '单位' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'num', t_label: '数量' },
|
||||
{ t_prop: 'leasePrice', t_label: '台班费单价（元/天）' },
|
||||
{ t_prop: 'startTime', t_label: '起租日期' },
|
||||
|
|
@ -118,27 +141,27 @@ export default {
|
|||
{ t_prop: 'trimDay', t_label: '调整天数', t_slot: 't_ipt' },
|
||||
{ t_prop: 'realDays', t_label: '实际结算天数' },
|
||||
{ t_prop: 'realCosts', t_label: '实际结算金额（元）' },
|
||||
{ t_prop: '', t_label: '已入账金额（元）' },
|
||||
{ t_prop: '', t_label: '本次结算金额（元）' },
|
||||
// { t_prop: '', t_label: '已入账金额（元）' },
|
||||
// { t_prop: '', t_label: '本次结算金额（元）' },
|
||||
],
|
||||
// 维修清单配置项
|
||||
repairTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '单位' },
|
||||
{ t_prop: '', t_label: '维修配件名称' },
|
||||
{ t_prop: '', t_label: '维修配件型号' },
|
||||
{ t_prop: 'num', t_label: '使用数量' },
|
||||
{ t_prop: '', t_label: '配件单价' },
|
||||
{ t_prop: 'costs', t_label: '配件总价' },
|
||||
{ t_prop: '', t_label: '委外维修费用' },
|
||||
{ t_prop: '', t_label: '费用总价' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'partName', t_label: '维修配件名称' },
|
||||
{ t_prop: 'partModelName', t_label: '维修配件型号' },
|
||||
{ t_prop: 'partNum', t_label: '使用数量' },
|
||||
{ t_prop: 'partPrice', t_label: '配件单价' },
|
||||
{ t_prop: 'partAllCosts', t_label: '配件总价' },
|
||||
// { t_prop: '', t_label: '委外维修费用' },
|
||||
// { t_prop: '', t_label: '费用总价' },
|
||||
],
|
||||
// 未还赔偿清单配置项
|
||||
noReturnTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '单位' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'maCode', t_label: '设备编码' },
|
||||
{ t_prop: 'num', t_label: '未还数量' },
|
||||
{ t_prop: 'buyPrice', t_label: '赔偿单价' },
|
||||
|
|
@ -148,7 +171,7 @@ export default {
|
|||
scrapTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '单位' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'maCode', t_label: '设备编码' },
|
||||
{ t_prop: 'num', t_label: '报废数量' },
|
||||
{ t_prop: 'costs', t_label: '赔偿单价' },
|
||||
|
|
@ -156,14 +179,13 @@ export default {
|
|||
],
|
||||
// 待报废清单配置项
|
||||
stayScrapTableColumns: [
|
||||
{ t_prop: '', t_label: '设备名称' },
|
||||
{ t_prop: 'type', t_label: '规格型号' },
|
||||
{ t_prop: '', t_label: '单位' },
|
||||
{ t_prop: '', t_label: '设备编码' },
|
||||
{ t_prop: 'date', t_label: '报废数量' },
|
||||
{ t_prop: '', t_label: '状态' },
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'maCode', t_label: '设备编码' },
|
||||
{ t_prop: 'num', t_label: '报废数量' },
|
||||
{ t_prop: '', t_label: '状态', t_slot: 'status' },
|
||||
],
|
||||
|
||||
// 结算清单数据源 01承担方
|
||||
settleTableData_01: [],
|
||||
// 结算清单数据源 03承担方
|
||||
|
|
@ -185,6 +207,8 @@ export default {
|
|||
// 是否结算
|
||||
isSettle_01: 0,
|
||||
isSettle_03: 0,
|
||||
// 选中的维修数据
|
||||
repairSelectList: [],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -202,15 +226,15 @@ export default {
|
|||
this.repairTableData = res.repairList // 维修单
|
||||
this.noReturnTableData = res.loseList // 未还赔偿
|
||||
this.scrapTableData = res.scrapList // 报废单
|
||||
this.stayScrapTableData = res.preScrapList // 报废单
|
||||
|
||||
this.settleTotalPrice_01 = res.relations[0].leaseCostOne
|
||||
this.settleTotalPrice_03 = res.relations[0].leaseCostThree
|
||||
// this.settleTotalPrice_01 = res.relations[0].repairList
|
||||
// this.settleTotalPrice_01 = res.relations[0].leaseCostOne
|
||||
this.scrapTotalPrice = res.relations[0].scrapCost
|
||||
this.noReturnTotalPrice = res.relations[0].loseCost
|
||||
this.repairTotalPrice = res.relations[0].repairCost
|
||||
this.isSettle_01 = res.relations[0].isSltOne
|
||||
this.isSettle_03 = res.relations[0].isSltThree
|
||||
console.log(res, '结算信息')
|
||||
},
|
||||
/** 确认结算 01或03 */
|
||||
async submitSell(type) {
|
||||
|
|
@ -235,14 +259,81 @@ export default {
|
|||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
},
|
||||
).then(() => {
|
||||
console.log('确定，后续走确定逻辑')
|
||||
).then(async () => {
|
||||
// 1. 先判断01 03 承担方是否有数据 若有数据 先确认终结日期是否为空 若为空 提示客户修改
|
||||
this.$message.closeAll()
|
||||
try {
|
||||
// 1.1 先循环列表数据 判断 终结日期是否为空
|
||||
let isFlag = false
|
||||
if (this.settleTableData_01.length > 0) {
|
||||
this.settleTableData_01.map((e, v) => {
|
||||
if (!e.endTime) {
|
||||
this.$message.error(
|
||||
'结算清单内终止日期不能有空值！',
|
||||
)
|
||||
isFlag = true
|
||||
throw new Error()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if (this.settleTableData_03.length > 0) {
|
||||
this.settleTableData_03.map((e, v) => {
|
||||
if (!e.endTime) {
|
||||
this.$message.error(
|
||||
'结算清单内终止日期不能有空值！',
|
||||
)
|
||||
isFlag = true
|
||||
throw new Error()
|
||||
}
|
||||
})
|
||||
}
|
||||
} catch {}
|
||||
if (isFlag) return
|
||||
let repairIds = []
|
||||
// 2. 处理勾选需要收费的维修数据 ids
|
||||
if (this.repairSelectList.length > 0) {
|
||||
this.repairSelectList.forEach((e) => {
|
||||
repairIds.push(e.id)
|
||||
})
|
||||
}
|
||||
|
||||
// 3. 组装请求参数
|
||||
const params = {
|
||||
repairIds: repairIds.join(','),
|
||||
agreementId: this.currRowInfo.agreementId,
|
||||
relation: {
|
||||
leaseCostOne: this.settleTotalPrice_01, // 01承担方费用
|
||||
leaseCostThree: this.settleTotalPrice_03, // 0.承担方
|
||||
repairCos: this.repairTotalPrice, // 维修
|
||||
scrapCost: this.scrapTotalPrice, // 报废
|
||||
loseCost: this.noReturnTotalPrice, // 遗失
|
||||
cost: this.totalAmount, // 总价
|
||||
},
|
||||
}
|
||||
|
||||
// 4. 发送请求
|
||||
console.log(params, '参数---')
|
||||
|
||||
const res = await submitAllFeeBearApi(params)
|
||||
|
||||
if (res.code === 200) {
|
||||
this.$message.success('结算成功！')
|
||||
this.$emit('closeCurrPage', true)
|
||||
}
|
||||
console.log(res, '结果结果')
|
||||
})
|
||||
},
|
||||
// 编辑后保存成功刷新列表
|
||||
handelSaveSuccess() {
|
||||
this.getComSellList()
|
||||
},
|
||||
/** 全部导出 */
|
||||
handleExportAll() {
|
||||
for (let i = 1; i < 7; i++) {
|
||||
this.handleExport(i)
|
||||
}
|
||||
},
|
||||
/** 单个导出 */
|
||||
handleExport(type) {
|
||||
let exportUrl = 'material/sltAgreementInfo/'
|
||||
|
|
@ -257,6 +348,7 @@ export default {
|
|||
exportTitle = '设备结算清单(费用承担方03)'
|
||||
break
|
||||
case 3:
|
||||
exportUrl += 'exportRepair'
|
||||
exportTitle = '设备维修清单'
|
||||
break
|
||||
case 4:
|
||||
|
|
@ -264,9 +356,11 @@ export default {
|
|||
exportTitle = '工机具未还赔偿清单'
|
||||
break
|
||||
case 5:
|
||||
exportUrl += 'exportScrap'
|
||||
exportTitle = '工机具报废赔偿清单'
|
||||
break
|
||||
case 6:
|
||||
exportUrl += 'exportPreScrap'
|
||||
exportTitle = '工机具待报废清单'
|
||||
break
|
||||
}
|
||||
|
|
@ -278,6 +372,11 @@ export default {
|
|||
)
|
||||
},
|
||||
|
||||
/** 维修费用选择时 */
|
||||
onChangeRepairPrice(val, list) {
|
||||
this.repairTotalPrice = val
|
||||
this.repairSelectList = list
|
||||
},
|
||||
/** 返回按钮 关闭当前页面 */
|
||||
goBack() {
|
||||
this.$emit('closeCurrPage')
|
||||
|
|
|
|||
|
|
@ -13,8 +13,12 @@
|
|||
@change="iptChange"
|
||||
/>
|
||||
</div>
|
||||
<span class="repair-tip" v-if="isRepair"
|
||||
>勾选需要赔偿的维修项目</span
|
||||
<span class="repair-tip" v-if="isRepair">
|
||||
{{
|
||||
currRowInfo.isSlt == 0
|
||||
? '勾选需要赔偿的维修项目'
|
||||
: '已选的维修赔偿项目'
|
||||
}}</span
|
||||
>
|
||||
<el-col :span="5" class="cost-bear">
|
||||
<span v-if="isCostBear">{{
|
||||
|
|
@ -35,7 +39,10 @@
|
|||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
v-if="isSettle == 0 && (isCostBear || isRepair)"
|
||||
v-if="
|
||||
isSettle == 0 &&
|
||||
(isCostBear || (isRepair && currRowInfo.isSlt == 0))
|
||||
"
|
||||
@click="handleEdit"
|
||||
>{{ isEdit ? '取消编辑' : '编辑' }}</el-button
|
||||
>
|
||||
|
|
@ -59,13 +66,25 @@
|
|||
<el-table
|
||||
border
|
||||
:data="tableData"
|
||||
ref="tableRef"
|
||||
:header-cell-class-name="setClassName"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
v-if="isRepair"
|
||||
v-if="isRepair && currRowInfo.isSlt == 0"
|
||||
:selectable="() => !this.selDisabled"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="55"
|
||||
v-if="isRepair && currRowInfo.isSlt == 1"
|
||||
>
|
||||
<template slot-scope="{ row }">
|
||||
<el-checkbox :checked="row.isSlt == 1" disabled />
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center"
|
||||
v-for="(t, index) in tableColumns"
|
||||
|
|
@ -115,6 +134,9 @@
|
|||
style="width: 150px"
|
||||
/>
|
||||
</template>
|
||||
<template v-else-if="t.t_slot && t.t_slot === 'status'">
|
||||
<el-tag size="mini" type="warning">待报废</el-tag>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row[t.t_prop] }}
|
||||
</template>
|
||||
|
|
@ -173,7 +195,13 @@ export default {
|
|||
type: Number,
|
||||
default: () => 0,
|
||||
},
|
||||
// 当前行的数据信息
|
||||
currRowInfo: {
|
||||
type: Object,
|
||||
default: () => null,
|
||||
},
|
||||
},
|
||||
|
||||
data() {
|
||||
return {
|
||||
isEdit: false, // 是否编辑数据
|
||||
|
|
@ -183,6 +211,7 @@ export default {
|
|||
selDisabled: true,
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
/** 编辑按钮 */
|
||||
handleEdit() {
|
||||
|
|
@ -193,6 +222,7 @@ export default {
|
|||
}
|
||||
|
||||
if (this.isRepair) {
|
||||
this.$refs.tableRef.clearSelection()
|
||||
this.selDisabled = !this.selDisabled
|
||||
}
|
||||
},
|
||||
|
|
@ -270,7 +300,7 @@ export default {
|
|||
// 1. 先循环列表数据 判断 终结日期是否为空
|
||||
this.tableData.map((e, v) => {
|
||||
if (!e.endTime) {
|
||||
this.$message.error('终结日期不能为空！')
|
||||
this.$message.error('终止日期不能有空值！')
|
||||
isFlag = true
|
||||
throw new Error()
|
||||
}
|
||||
|
|
@ -300,6 +330,15 @@ export default {
|
|||
return 'all-disabled'
|
||||
}
|
||||
},
|
||||
/** 列表复选框选择事件 */
|
||||
handleSelectionChange(list) {
|
||||
let repairPriceAmount = 0
|
||||
console.log(list, 'list')
|
||||
list.forEach((e) => {
|
||||
repairPriceAmount += e.partAllCosts * 1
|
||||
})
|
||||
this.$emit('onChangeRepairPrice', repairPriceAmount, list)
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -15,10 +15,14 @@
|
|||
type="month"
|
||||
placeholder="请选择月份"
|
||||
value-format="yyyy-MM"
|
||||
@change="onChangeTime"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="费用承担方" prop="costBear">
|
||||
<el-select v-model="monthRecordParams.costBear" clearable>
|
||||
<el-form-item label="费用承担方" prop="costBearingParty">
|
||||
<el-select
|
||||
v-model="monthRecordParams.costBearingParty"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in costBearList"
|
||||
:key="item.id"
|
||||
|
|
@ -45,7 +49,7 @@
|
|||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="handleBatchExport"
|
||||
@click="handelExport(null)"
|
||||
>批量导出</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
|
|
@ -79,7 +83,7 @@
|
|||
<el-button type="text" @click="previewDetails(row)"
|
||||
>明细</el-button
|
||||
>
|
||||
<el-button type="text" @click="exportDetails(row)"
|
||||
<el-button type="text" @click="handelExport(row)"
|
||||
>导出明细表</el-button
|
||||
>
|
||||
</template>
|
||||
|
|
@ -146,7 +150,7 @@
|
|||
/>
|
||||
<el-table-column
|
||||
prop="nuitName"
|
||||
label="单位"
|
||||
label="计量单位"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column prop="num" label="数量" align="center" />
|
||||
|
|
@ -211,8 +215,8 @@ export default {
|
|||
monthRecordParams: {
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
costBear: '',
|
||||
agreementId: '',
|
||||
costBearingParty: '',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
|
|
@ -238,14 +242,10 @@ export default {
|
|||
methods: {
|
||||
/** 获取月结记录列表数据 */
|
||||
async getMonthRecordList() {
|
||||
// console.log('99999')
|
||||
this.monthRecordParams.startTime = this.dateMonth[0] || ''
|
||||
this.monthRecordParams.endTime = this.dateMonth[1] || ''
|
||||
this.monthRecordParams.agreementId = this.agreementId
|
||||
// 调后台 Api 获取数据
|
||||
const res = await getMonthRecordApi([this.monthRecordParams])
|
||||
this.monthRecordList = res.data
|
||||
console.log(res, '月结记录---')
|
||||
},
|
||||
/** 查询 */
|
||||
handleQuery() {
|
||||
|
|
@ -254,19 +254,41 @@ export default {
|
|||
/** 重置 */
|
||||
resetQuery() {
|
||||
this.resetForm('monthRecordFormRef')
|
||||
this.dateMonth = []
|
||||
this.monthRecordParams.startTime = ''
|
||||
this.monthRecordParams.endTime = ''
|
||||
this.getMonthRecordList()
|
||||
},
|
||||
/** 批量明细导出 */
|
||||
handleBatchExport() {
|
||||
if (this.selectList.length < 1) {
|
||||
/** 导出按钮 */
|
||||
handelExport(row) {
|
||||
// 如果 row 为null 表示批量导出
|
||||
const { startTime, endTime, agreementId, costBearingParty } =
|
||||
this.monthRecordParams
|
||||
let exportList = [
|
||||
{
|
||||
codeNum: '',
|
||||
startTime,
|
||||
endTime,
|
||||
agreementId,
|
||||
costBearingParty,
|
||||
},
|
||||
]
|
||||
if (!row && this.selectList.length < 1) {
|
||||
this.$message.error('请勾选需要导出的数据！')
|
||||
return
|
||||
} else if (!row && this.selectList.length > 0) {
|
||||
this.selectList.map((e) => {
|
||||
exportList[0].codeNum += e.codeNum + '，'
|
||||
})
|
||||
exportList[0].codeNum = exportList[0].codeNum.slice(0, -1)
|
||||
} else {
|
||||
exportList[0].codeNum = row.codeNum
|
||||
}
|
||||
},
|
||||
/** 单个明细导出 */
|
||||
exportDetails(row) {
|
||||
console.log('导出--', row)
|
||||
|
||||
this.downloadJson(
|
||||
'material/sltAgreementInfo/exportSltInfoMonth',
|
||||
JSON.stringify(exportList),
|
||||
`月结明细${new Date().getTime()}.xlsx`,
|
||||
)
|
||||
},
|
||||
/** 列表勾选 */
|
||||
handleSelectionChange(list) {
|
||||
|
|
@ -293,6 +315,21 @@ export default {
|
|||
this.monthDetails = row.node
|
||||
this.innerVisible = true
|
||||
},
|
||||
/** 时间变化 */
|
||||
onChangeTime(val) {
|
||||
let startTime = ''
|
||||
if (val.split('-')[1] == 1) {
|
||||
startTime = `${val.split('-')[0] * 1 - 1}-12-21`
|
||||
} else {
|
||||
startTime = `${val.split('-')[0]}-0${
|
||||
val.split('-')[1] * 1 - 1
|
||||
}-21`
|
||||
}
|
||||
let endTime = val + '-20'
|
||||
|
||||
this.monthRecordParams.startTime = startTime
|
||||
this.monthRecordParams.endTime = endTime
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -127,17 +127,10 @@
|
|||
<!-- <span v-if="scope.row.sltStatus == '1'">未结算</span>
|
||||
<span v-if="scope.row.sltStatus == '2'">已结算</span>
|
||||
<span v-if="scope.row.sltStatus == '3'">待审核</span> -->
|
||||
<el-tag
|
||||
type="warning"
|
||||
size="mini"
|
||||
v-if="row.sltStatus == 1"
|
||||
<el-tag type="warning" size="mini" v-if="row.isSlt == 0"
|
||||
>结算中</el-tag
|
||||
>
|
||||
<el-tag
|
||||
type="success"
|
||||
size="mini"
|
||||
style="margin-left: 8px"
|
||||
v-if="row.sltStatus == 2"
|
||||
<el-tag type="success" size="mini" v-if="row.isSlt == 1"
|
||||
>已结算</el-tag
|
||||
>
|
||||
</template>
|
||||
|
|
@ -153,11 +146,11 @@
|
|||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
:type="row.isSlt == 1 ? 'success' : 'primary'"
|
||||
style="padding: 5px 10px"
|
||||
@click="handleFinishCostAndDetails(row)"
|
||||
>{{
|
||||
row.status == 2 ? '结算明细' : '完工结算'
|
||||
row.isSlt == 1 ? '结算明细' : '完工结算'
|
||||
}}</el-button
|
||||
>
|
||||
</template>
|
||||
|
|
@ -226,9 +219,9 @@ export default {
|
|||
// 工程数据
|
||||
projectList: [],
|
||||
statusList: [
|
||||
{ id: '0', name: '请选择' },
|
||||
{ id: '1', name: '结算中' },
|
||||
{ id: '2', name: '已结算' },
|
||||
{ id: '', name: '请选择' },
|
||||
{ id: '0', name: '结算中' },
|
||||
{ id: '1', name: '已结算' },
|
||||
], //集合
|
||||
// 表格数据
|
||||
agreementList: [
|
||||
|
|
@ -370,8 +363,11 @@ export default {
|
|||
this.monthRecordDialogVisible = false
|
||||
},
|
||||
/** 关闭完工结算或结算明细页面 */
|
||||
closeCurrPage() {
|
||||
closeCurrPage(isRefresh) {
|
||||
this.isHome = true
|
||||
if (isRefresh) {
|
||||
this.getList()
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -230,7 +230,6 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="domain.partType == 1"
|
||||
:prop="'premiumListTwo.' + index + '.partType'"
|
||||
label="是否收费："
|
||||
required
|
||||
|
|
|
|||
|
|
@ -17,14 +17,15 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="框架年份" prop="year">
|
||||
<el-date-picker
|
||||
v-model="queryParams.year"
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="框架年份" prop="year">
|
||||
<el-date-picker
|
||||
v-model="queryParams.year"
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
@ -45,13 +46,13 @@
|
|||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-bottom"
|
||||
size="mini"
|
||||
v-hasPermi="['machinery:parts:add']"
|
||||
@click="handleUploadExcel"
|
||||
>导入</el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-bottom"
|
||||
size="mini"
|
||||
v-hasPermi="['machinery:parts:add']"
|
||||
@click="handleUploadExcel"
|
||||
>导入</el-button
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
@ -73,12 +74,12 @@
|
|||
>展开/折叠</el-button
|
||||
>
|
||||
<el-button
|
||||
type="info"
|
||||
plain
|
||||
icon="el-icon-top"
|
||||
size="mini"
|
||||
@click="downloadExcelTemplate"
|
||||
>下载导入模板</el-button
|
||||
type="info"
|
||||
plain
|
||||
icon="el-icon-top"
|
||||
size="mini"
|
||||
@click="downloadExcelTemplate"
|
||||
>下载导入模板</el-button
|
||||
>
|
||||
</el-col>
|
||||
<right-toolbar
|
||||
|
|
@ -255,6 +256,7 @@
|
|||
<el-dialog
|
||||
title="上传文件"
|
||||
:visible.sync="openUpload"
|
||||
v-if="openUpload"
|
||||
width="400px"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
|
|
@ -271,34 +273,37 @@
|
|||
>
|
||||
<el-button size="small" type="primary">点击上传</el-button>
|
||||
</el-upload>
|
||||
<div style="
|
||||
font-size: 12px;
|
||||
color: #999999;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin: 20px 0;
|
||||
"
|
||||
<div
|
||||
style="
|
||||
font-size: 12px;
|
||||
color: #999999;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin: 20px 0;
|
||||
"
|
||||
>
|
||||
<span>支持格式：excel表格，单个文件不能超过20MB</span>
|
||||
<span>注意：需要根据模版导入本年配件框架内容，重复上传会覆盖本年框架内容。</span>
|
||||
<span
|
||||
>注意：需要根据模版导入本年配件框架内容，重复上传会覆盖本年框架内容。</span
|
||||
>
|
||||
</div>
|
||||
<div style="
|
||||
display: flex;
|
||||
justify-content: right;
|
||||
align-items: center;
|
||||
margin-top: 20px
|
||||
">
|
||||
<div
|
||||
style="
|
||||
display: flex;
|
||||
justify-content: right;
|
||||
align-items: center;
|
||||
margin-top: 20px;
|
||||
"
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
style="margin-right: 6px;"
|
||||
@click="confirmUpload"
|
||||
>确定</el-button>
|
||||
<el-button
|
||||
@click="closeExcelDialog"
|
||||
>取消</el-button>
|
||||
type="primary"
|
||||
style="margin-right: 6px"
|
||||
@click="confirmUpload"
|
||||
>确定</el-button
|
||||
>
|
||||
<el-button @click="closeExcelDialog">取消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -342,7 +347,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
paName: undefined,
|
||||
year: undefined
|
||||
year: undefined,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
|
|
@ -387,7 +392,7 @@ export default {
|
|||
isEdit: false,
|
||||
// excel文件列表
|
||||
fileList: [],
|
||||
excelList: undefined
|
||||
excelList: undefined,
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -396,49 +401,53 @@ export default {
|
|||
methods: {
|
||||
/** 确认上传excel */
|
||||
confirmUpload() {
|
||||
if (this.excelList != undefined) {
|
||||
let ifSize = this.excelList.file.size / 1024 / 1024 < 20;
|
||||
if (!ifSize) {
|
||||
this.$modal.msgError('上传文件大于20M，请重新选择文件上传！')
|
||||
} else {
|
||||
console.log(this.excelList)
|
||||
excelUpLoad(this.excelList).then(res => {
|
||||
console.log(res)
|
||||
if (res.code == 200) {
|
||||
this.$modal.msgSuccess(res.msg)
|
||||
this.openUpload = false
|
||||
this.reset()
|
||||
this.getList()
|
||||
if (this.excelList != undefined) {
|
||||
let ifSize = this.excelList.file.size / 1024 / 1024 < 20
|
||||
if (!ifSize) {
|
||||
this.$modal.msgError(
|
||||
'上传文件大于20M，请重新选择文件上传！',
|
||||
)
|
||||
} else {
|
||||
this.$modal.msgError(res.msg)
|
||||
console.log(this.excelList)
|
||||
excelUpLoad(this.excelList)
|
||||
.then((res) => {
|
||||
console.log(res)
|
||||
if (res.code == 200) {
|
||||
this.$modal.msgSuccess(res.msg)
|
||||
this.openUpload = false
|
||||
this.reset()
|
||||
this.getList()
|
||||
} else {
|
||||
this.$modal.msgError(res.msg)
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err)
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
})
|
||||
} else {
|
||||
this.$modal.msgError('请选择上传文件！')
|
||||
}
|
||||
} else {
|
||||
this.$modal.msgError('请选择上传文件！')
|
||||
}
|
||||
},
|
||||
/** 点击下载excel导入模板 */
|
||||
downloadExcelTemplate() {
|
||||
this.download(
|
||||
'material/base/maPartType/downLoad',
|
||||
{},
|
||||
`配件模板.xlsx`,
|
||||
)
|
||||
this.download(
|
||||
'material/base/maPartType/downLoad',
|
||||
{},
|
||||
`配件模板.xlsx`,
|
||||
)
|
||||
},
|
||||
/** 上传excel文件 */
|
||||
uploadExcel(obj) {
|
||||
this.excelList = obj
|
||||
this.excelList = obj
|
||||
},
|
||||
/** 移除excel文件 */
|
||||
handleRemoveExcel() {
|
||||
this.excelList = undefined
|
||||
this.excelList = undefined
|
||||
},
|
||||
/** 上传的excel数超出限制 */
|
||||
excelExceed(files, fileList) {
|
||||
this.$modal.msgError('上传的excel文件数量超出限制！')
|
||||
this.$modal.msgError('上传的excel文件数量超出限制！')
|
||||
},
|
||||
/** 上传excel文件前 */
|
||||
beforeExcelUpload(file) {
|
||||
|
|
@ -454,12 +463,12 @@ export default {
|
|||
},
|
||||
/** 关闭excel弹窗 */
|
||||
closeExcelDialog() {
|
||||
this.excelList = undefined
|
||||
this.openUpload = false
|
||||
this.excelList = undefined
|
||||
this.openUpload = false
|
||||
},
|
||||
/** 查询部门列表 */
|
||||
getList() {
|
||||
console.log(this.queryParams)
|
||||
console.log(this.queryParams)
|
||||
// this.loading = true;
|
||||
listPartType(this.queryParams)
|
||||
.then((response) => {
|
||||
|
|
|
|||
|
|
@ -246,7 +246,12 @@
|
|||
</el-form>
|
||||
<el-row :gutter="10" class="mb8" v-if="showHandle">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain size="mini" @click="passAll"
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
size="mini"
|
||||
@click="passAll"
|
||||
:loading="passLoading"
|
||||
>确认入库</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
|
@ -596,6 +601,7 @@ export default {
|
|||
],
|
||||
},
|
||||
userId: sessionStorage.getItem('userId'),
|
||||
passLoading: false, // 确认入库按钮 loading
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -714,6 +720,7 @@ export default {
|
|||
changePutinStatus(param).then((response) => {
|
||||
if (response.code == 200) {
|
||||
this.$modal.msgSuccess('审批成功')
|
||||
this.open = false
|
||||
this.getDialogTable()
|
||||
this.getList()
|
||||
} else {
|
||||
|
|
@ -728,6 +735,8 @@ export default {
|
|||
taskId: this.query.taskId,
|
||||
dictName: this.query.dictName,
|
||||
}
|
||||
|
||||
this.passLoading = true
|
||||
getPutinDetailsList(params).then((res) => {
|
||||
let deviceList = res.rows
|
||||
deviceList.forEach((item) => {
|
||||
|
|
@ -742,15 +751,19 @@ export default {
|
|||
checkResult: '1',
|
||||
inputRecordList: deviceList,
|
||||
}
|
||||
changePutinStatus(param).then((response) => {
|
||||
if (response.code == 200) {
|
||||
this.$modal.msgSuccess('审批成功')
|
||||
this.getDialogTable()
|
||||
this.getList()
|
||||
} else {
|
||||
this.$modal.msgSuccess('审批失败')
|
||||
}
|
||||
})
|
||||
changePutinStatus(param)
|
||||
.then((response) => {
|
||||
if (response.code == 200) {
|
||||
this.$modal.msgSuccess('审批成功')
|
||||
this.getDialogTable()
|
||||
this.getList()
|
||||
} else {
|
||||
this.$modal.msgSuccess('审批失败')
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
this.passLoading = false
|
||||
})
|
||||
})
|
||||
},
|
||||
//拒绝
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ module.exports = {
|
|||
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
|
||||
// target: `https://z.csgmall.com.cn`,
|
||||
|
||||
// target: `http://192.168.2.160:39080`, //超
|
||||
target: `http://192.168.2.141:39080`, //超
|
||||
// target: `http://10.40.92.81:8080`, //韩/
|
||||
// target: `http://10.40.92.74:8080`,//旭/
|
||||
// target: `http://10.40.92.138:28080`, //帅
|
||||
target: `http://192.168.2.218:39080`, //福
|
||||
// target: `http://192.168.2.218:39080`, //福
|
||||
// target: `http://192.168.2.120:39080`, //跃
|
||||
|
||||
//******** 注意事项 ********* */
|
||||
|
|
|
|||
Reference in New Issue