Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui
This commit is contained in:
commit
23461a778d
|
|
@ -56,7 +56,7 @@
|
|||
<el-table v-loading="loading" :data="formList" ref="multipleTable" row-key="id" border :max-height="650">
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请时间" align="center" prop="createTime" width="100px" />
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@
|
|||
width="600px"
|
||||
append-to-body
|
||||
@close="closeView"
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-form ref="maForm" :model="maForm" :rules="rules" label-width="120px">
|
||||
<el-row :gutter="24">
|
||||
|
|
@ -266,6 +267,7 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
isSubmit: false,
|
||||
taskId: "",
|
||||
// isEdit: false,
|
||||
// 遮罩层
|
||||
|
|
@ -511,6 +513,9 @@ export default {
|
|||
return this.$modal.msgError(errorInfo);
|
||||
}
|
||||
console.log("xxxxxxxxxxxxxxxxxxxxxx", itemsTemp)
|
||||
if (this.isSubmit) return
|
||||
this.isSubmit = true
|
||||
this.loading = true
|
||||
applySubmit({
|
||||
leaseApplyDetailsList: itemsTemp,
|
||||
leaseApplyInfo: leaseApplyInfo,
|
||||
|
|
@ -524,7 +529,11 @@ export default {
|
|||
this.$emit("addToolsSuccess");
|
||||
}
|
||||
this.loading = false;
|
||||
});
|
||||
this.isSubmit = false
|
||||
}).catch(() => {
|
||||
this.loading = false
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
<el-table v-loading="loading" :data="formList" ref="multipleTable" row-key="id" border :max-height="650">
|
||||
<el-table-column label="序号" align="center" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请时间" align="center" prop="createTime" width="100" />
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@
|
|||
>
|
||||
<template scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
<el-table-column type="selection" width="55" align="center" :selectable="selectable" :reserve-selection="true"/>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
|
||||
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="文件名称" align="left" prop="docName" show-overflow-tooltip width="300">
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<!-- <el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column align="center" label="序号" type="index" >
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -71,7 +71,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
>减免明细导出</el-button>
|
||||
<el-button type="warning" size="mini" @click="handleExportAll"
|
||||
>全部明细导出</el-button>
|
||||
<el-button type="primary" size="mini" @click="handlePrint">打印</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="4">
|
||||
<el-button type="danger" size="mini" style="float: right" @click="handleBack"
|
||||
|
|
@ -27,189 +28,598 @@
|
|||
}}，报废费用¥{{ scrapCost }}，丢失费用{{ loseCost }}
|
||||
</div> -->
|
||||
|
||||
<div style="margin-top:20px">
|
||||
<div class="tabelAllTop">
|
||||
<div class="costTop">结算费用</div>
|
||||
</div>
|
||||
<div class="tabelAllTopUnit">
|
||||
<div class="costTopUnit">结算单位</div>
|
||||
<div class="costRightUnit">
|
||||
{{ unitName }}
|
||||
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
|
||||
<!-- <div style="margin-top: 20px">
|
||||
<div class="tabelAllTop">
|
||||
<div class="costTop">结算费用</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tabelAllTopUnit">
|
||||
<div class="costTopUnit">结算工程</div>
|
||||
<div class="costRightUnit">
|
||||
{{ projectName }}
|
||||
<div class="tabelAllTopUnit">
|
||||
<div class="costTopUnit">结算单位</div>
|
||||
<div class="costRightUnit">
|
||||
{{ unitName }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="leaseList">
|
||||
<el-table-column label="租赁费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60"/>
|
||||
<!-- <el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/> -->
|
||||
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.leasePrice.toFixed(2) }}
|
||||
</template>
|
||||
<div class="tabelAllTopUnit">
|
||||
<div class="costTopUnit">结算工程</div>
|
||||
<div class="costRightUnit">
|
||||
{{ projectName }}
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="leaseList">
|
||||
<el-table-column label="租赁费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60" />
|
||||
<el-table-column
|
||||
label="设备名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="modelName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="计量单位"
|
||||
align="center"
|
||||
prop="mtUnitName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="租赁单价"
|
||||
align="center"
|
||||
prop="leasePrice"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope" v-show="scope.row.leasePrice">
|
||||
{{ scope.row.leasePrice.toFixed(3) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope" v-show="scope.row.num">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="租赁日期"
|
||||
align="center"
|
||||
prop="startTime"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="归还日期 "
|
||||
align="center"
|
||||
prop="endTime"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope" v-show="scope.row.leaseDays">
|
||||
{{ Number(scope.row.leaseDays).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="租赁费用（元）"
|
||||
align="center"
|
||||
prop="costs"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope" v-show="scope.row.costs">
|
||||
{{ scope.row.costs.toFixed(3) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column label="归还数量" align="center" prop="" :show-overflow-tooltip="true" /> -->
|
||||
<el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.leaseDays).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="租赁费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.costs.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-table>
|
||||
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ leaseCost }}
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ leaseCost }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div style="margin: 20px 0">
|
||||
<table
|
||||
border="1"
|
||||
cellspacing="0"
|
||||
cellpadding="6"
|
||||
style="width: 100%; border-collapse: collapse; text-align: center"
|
||||
>
|
||||
<!-- 表头 -->
|
||||
<tr>
|
||||
<th colspan="10">结算费用</th>
|
||||
</tr>
|
||||
|
||||
<!-- 单位 & 工程 -->
|
||||
<tr>
|
||||
<td style="width: 100px; text-align: center">结算单位</td>
|
||||
<td colspan="9" style="text-align: center">{{ unitName }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: center">结算工程</td>
|
||||
<td colspan="9" style="text-align: center">{{ projectName }}</td>
|
||||
</tr>
|
||||
|
||||
<!-- 租赁费用明细表头 -->
|
||||
<tr>
|
||||
<th colspan="10">租赁费用明细</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th style="width: 60px">序号</th>
|
||||
<th>设备名称</th>
|
||||
<th>规格型号</th>
|
||||
<th>计量单位</th>
|
||||
<th>租赁单价</th>
|
||||
<th>租赁数量</th>
|
||||
<th>租赁日期</th>
|
||||
<th>归还日期</th>
|
||||
<th>租赁天数</th>
|
||||
<th>租赁费用（元）</th>
|
||||
</tr>
|
||||
|
||||
<!-- 租赁费用明细内容 -->
|
||||
<tr v-for="(item, index) in leaseList" :key="index">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td>{{ item.typeName }}</td>
|
||||
<td>{{ item.modelName }}</td>
|
||||
<td>{{ item.mtUnitName }}</td>
|
||||
<td v-if="item.leasePrice">{{ item.leasePrice.toFixed(3) }}</td>
|
||||
<td v-else></td>
|
||||
<td v-if="item.num">{{ item.num.toFixed(2) }}</td>
|
||||
<td v-else></td>
|
||||
<td>{{ item.startTime }}</td>
|
||||
<td>{{ item.endTime }}</td>
|
||||
<td v-if="item.leaseDays">{{ Number(item.leaseDays).toFixed(2) }}</td>
|
||||
<td v-else></td>
|
||||
<td v-if="item.costs">{{ item.costs.toFixed(3) }}</td>
|
||||
<td v-else></td>
|
||||
</tr>
|
||||
|
||||
<!-- 小计 -->
|
||||
<tr>
|
||||
<td style="text-align: center">费用小计：</td>
|
||||
<td colspan="9" style="text-align: center">{{ leaseCost }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- <div>
|
||||
<el-table :data="repairList">
|
||||
<el-table-column label="维修费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60" />
|
||||
<el-table-column
|
||||
label="设备名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="modelName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="计量单位"
|
||||
align="center"
|
||||
prop="mtUnitName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope" v-show="scope.row.num">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="是否收费"
|
||||
align="center"
|
||||
prop="partType"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="维修费用（元）"
|
||||
align="center"
|
||||
prop="costs"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope" v-show="scope.row.costs">
|
||||
{{ scope.row.costs.toFixed(3) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ repairCost }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div style="margin-bottom: 20px">
|
||||
<table
|
||||
border="1"
|
||||
cellspacing="0"
|
||||
cellpadding="6"
|
||||
style="width: 100%; border-collapse: collapse; text-align: center"
|
||||
>
|
||||
<!-- 表头 -->
|
||||
<tr>
|
||||
<th colspan="7">维修费用明细</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th style="width: 100px">序号</th>
|
||||
<th>设备名称</th>
|
||||
<th>规格型号</th>
|
||||
<th>计量单位</th>
|
||||
<th>维修数量</th>
|
||||
<th>是否收费</th>
|
||||
<th>维修费用（元）</th>
|
||||
</tr>
|
||||
|
||||
<!-- 数据行 -->
|
||||
<tr v-for="(item, index) in repairList" :key="index">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td>{{ item.typeName }}</td>
|
||||
<td>{{ item.modelName }}</td>
|
||||
<td>{{ item.mtUnitName }}</td>
|
||||
<td v-if="item.num">{{ item.num.toFixed(2) }}</td>
|
||||
<td v-else></td>
|
||||
<td>{{ item.partType }}</td>
|
||||
<td v-if="item.costs">{{ item.costs.toFixed(3) }}</td>
|
||||
<td v-else></td>
|
||||
</tr>
|
||||
|
||||
<!-- 小计 -->
|
||||
<tr>
|
||||
<td style="text-align: center">费用小计：</td>
|
||||
<td colspan="6" style="text-align: center">{{ repairCost }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- <div>
|
||||
<el-table :data="loseList">
|
||||
<el-table-column label="丢失费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60" />
|
||||
<el-table-column
|
||||
label="设备名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="modelName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="计量单位"
|
||||
align="center"
|
||||
prop="mtUnitName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope" v-show="scope.row.num">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="丢失费用（元）"
|
||||
align="center"
|
||||
prop="costs"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope" v-show="scope.row.costs">
|
||||
{{ scope.row.costs.toFixed(3) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ loseCost }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div style="margin-bottom: 20px">
|
||||
<table
|
||||
border="1"
|
||||
cellspacing="0"
|
||||
cellpadding="6"
|
||||
style="width: 100%; border-collapse: collapse; text-align: center"
|
||||
>
|
||||
<!-- 表头 -->
|
||||
<tr>
|
||||
<th colspan="6">丢失费用明细</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th style="width: 100px">序号</th>
|
||||
<th>设备名称</th>
|
||||
<th>规格型号</th>
|
||||
<th>计量单位</th>
|
||||
<th>丢失数量</th>
|
||||
<th>丢失费用（元）</th>
|
||||
</tr>
|
||||
|
||||
<!-- 数据行 -->
|
||||
<tr v-for="(item, index) in loseList" :key="index">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td>{{ item.typeName }}</td>
|
||||
<td>{{ item.modelName }}</td>
|
||||
<td>{{ item.mtUnitName }}</td>
|
||||
<td v-if="item.num">{{ item.num.toFixed(2) }}</td>
|
||||
<td v-else></td>
|
||||
<td v-if="item.costs">{{ item.costs.toFixed(3) }}</td>
|
||||
<td v-else></td>
|
||||
</tr>
|
||||
|
||||
<!-- 小计 -->
|
||||
<tr>
|
||||
<td style="text-align: center">费用小计：</td>
|
||||
<td colspan="5" style="text-align: center">{{ loseCost }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- <div>
|
||||
<el-table :data="scrapList">
|
||||
<el-table-column label="报废费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60" />
|
||||
<el-table-column
|
||||
label="设备名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="modelName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="计量单位"
|
||||
align="center"
|
||||
prop="mtUnitName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope" v-show="scope.row.num">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="是否收费"
|
||||
align="center"
|
||||
prop="partType"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="报废费用（元）"
|
||||
align="center"
|
||||
prop="costs"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope" v-show="scope.row.costs">
|
||||
{{ scope.row.costs.toFixed(3) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ scrapCost }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div style="margin-bottom: 20px">
|
||||
<table
|
||||
border="1"
|
||||
cellspacing="0"
|
||||
cellpadding="6"
|
||||
style="width: 100%; border-collapse: collapse; text-align: center"
|
||||
>
|
||||
<!-- 表头 -->
|
||||
<tr>
|
||||
<th colspan="7">报废费用明细</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th style="width: 100px">序号</th>
|
||||
<th>设备名称</th>
|
||||
<th>规格型号</th>
|
||||
<th>计量单位</th>
|
||||
<th>报废数量</th>
|
||||
<th>是否收费</th>
|
||||
<th>报废费用（元）</th>
|
||||
</tr>
|
||||
|
||||
<!-- 数据行 -->
|
||||
<tr v-for="(item, index) in scrapList" :key="index">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td>{{ item.typeName }}</td>
|
||||
<td>{{ item.modelName }}</td>
|
||||
<td>{{ item.mtUnitName }}</td>
|
||||
<td v-if="item.num">{{ item.num.toFixed(2) }}</td>
|
||||
<td v-else></td>
|
||||
<td>{{ item.partType }}</td>
|
||||
<td v-if="item.costs">{{ item.costs.toFixed(3) }}</td>
|
||||
<td v-else></td>
|
||||
</tr>
|
||||
|
||||
<!-- 小计 -->
|
||||
<tr>
|
||||
<td style="text-align: center">费用小计：</td>
|
||||
<td colspan="6" style="text-align: center">{{ scrapCost }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- <div>
|
||||
<el-table :data="reducList">
|
||||
<el-table-column label="减免费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60" />
|
||||
<el-table-column
|
||||
label="设备名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="modeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="计量单位"
|
||||
align="center"
|
||||
prop="unitName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="租赁单价"
|
||||
align="center"
|
||||
prop="leasePrice"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="减免数量"
|
||||
align="center"
|
||||
prop="reduceNum"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="减免开始日期"
|
||||
align="center"
|
||||
prop="startTime"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="减免结束日期"
|
||||
align="center"
|
||||
prop="endTime"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="减免天数" align="center" prop="days" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="减免原因" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="减免费用（元）"
|
||||
align="center"
|
||||
prop="leaseMoney"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope" v-show="scope.row.leaseMoney">
|
||||
{{ scope.row.leaseMoney.toFixed(3) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAllBottom">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ reducCost }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="tabelAllBottom">
|
||||
<div class="columnAllNum">合计：</div>
|
||||
<div class="columnAll">
|
||||
{{ costAll.toFixed(2) }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div style="margin-bottom: 20px">
|
||||
<table
|
||||
border="1"
|
||||
cellspacing="0"
|
||||
cellpadding="6"
|
||||
style="width: 100%; border-collapse: collapse; text-align: center"
|
||||
>
|
||||
<!-- 表头 -->
|
||||
<tr>
|
||||
<th colspan="11">减免费用明细</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th style="width: 100px">序号</th>
|
||||
<th>设备名称</th>
|
||||
<th>规格型号</th>
|
||||
<th>计量单位</th>
|
||||
<th>租赁单价</th>
|
||||
<th>减免数量</th>
|
||||
<th>减免开始日期</th>
|
||||
<th>减免结束日期</th>
|
||||
<th>减免天数</th>
|
||||
<th>减免原因</th>
|
||||
<th>减免费用（元）</th>
|
||||
</tr>
|
||||
|
||||
<!-- 数据行 -->
|
||||
<tr v-for="(item, index) in reducList" :key="index">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td>{{ item.typeName }}</td>
|
||||
<td>{{ item.modeName }}</td>
|
||||
<td>{{ item.unitName }}</td>
|
||||
<td v-if="item.leasePrice">{{ item.leasePrice }}</td>
|
||||
<td v-else></td>
|
||||
<td v-if="item.reduceNum">{{ item.reduceNum }}</td>
|
||||
<td v-else></td>
|
||||
<td>{{ item.startTime }}</td>
|
||||
<td>{{ item.endTime }}</td>
|
||||
<td>{{ item.days }}</td>
|
||||
<td>{{ item.remark }}</td>
|
||||
<td v-if="item.leaseMoney">{{ item.leaseMoney.toFixed(3) }}</td>
|
||||
<td v-else></td>
|
||||
</tr>
|
||||
|
||||
<!-- 小计 -->
|
||||
<tr>
|
||||
<td style="text-align: center">费用小计：</td>
|
||||
<td colspan="10" style="text-align: center">{{ reducCost }}</td>
|
||||
</tr>
|
||||
|
||||
<!-- 合计 -->
|
||||
<tr>
|
||||
<td style="text-align: center">合计：</td>
|
||||
<td colspan="10" style="text-align: center">{{ costAll.toFixed(2) }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="fillIn" style="margin-top: 20px; display: flex; justify-content: space-between">
|
||||
<div class="item" style="width: 33%">
|
||||
<div>
|
||||
<span>部门负责人：</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item" style="width: 33%">
|
||||
<div>
|
||||
<span>承租负责人：</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item" style="width: 33%">
|
||||
<div>
|
||||
<span>核算员：</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<el-table :data="repairList">
|
||||
<el-table-column label="维修费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60"/>
|
||||
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="维修费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.costs.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ repairCost }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<el-table :data="scrapList">
|
||||
<el-table-column label="报废费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60"/>
|
||||
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="报废费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.costs.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ scrapCost }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<el-table :data="loseList">
|
||||
<el-table-column label="丢失费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60"/>
|
||||
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.num.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="丢失费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.costs.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAll">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ loseCost }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<el-table :data="reducList">
|
||||
<el-table-column label="减免费用明细" align="center">
|
||||
<el-table-column label="序号" align="center" type="index" width="60"/>
|
||||
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="modeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="减免数量" align="center" prop="reduceNum" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="减免开始日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="减免结束日期" align="center" prop="endTime" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="减免天数" align="center" prop="days" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="减免原因" align="center" prop="remark" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="减免费用（元）" align="center" prop="leaseMoney" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope" v-if="scope.row.leaseMoney">
|
||||
{{ scope.row.leaseMoney.toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="tabelAllBottom">
|
||||
<div class="columnAllNum">费用小计：</div>
|
||||
<div class="columnAll">
|
||||
{{ reducCost }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="tabelAllBottom">
|
||||
<div class="columnAllNum">合计：</div>
|
||||
<div class="columnAll">
|
||||
{{ costAll.toFixed(2) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</vue-easy-print>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getSltInfo, submitFee,submitCosts } from '@/api/cost/cost'
|
||||
import vueEasyPrint from 'vue-easy-print'
|
||||
|
||||
export default {
|
||||
components: { vueEasyPrint },
|
||||
name: '',
|
||||
dicts: [],
|
||||
props: {
|
||||
|
|
@ -249,6 +659,9 @@ export default {
|
|||
// this.getProjectList();
|
||||
},
|
||||
methods: {
|
||||
handlePrint() {
|
||||
this.$refs.remarksPrintRef.print()
|
||||
},
|
||||
//获取单位类型 ,getUnitList, getProjectList
|
||||
getUnitList() {
|
||||
getUnitList().then((response) => {
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<el-table-column label="序号" align="center" type="index" width="60">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
<el-table-column label="序号" align="center" type="index" width="60">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 + scope.$index + 1
|
||||
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">领料申请</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-col :span="1.5" v-hasPermi="['purchase:person:notice']">
|
||||
<el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleSendAll">发布</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -453,6 +453,7 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
isSubmit: false,
|
||||
loading: true,
|
||||
loadingTwo: true,
|
||||
updateTime: '',
|
||||
|
|
@ -1173,12 +1174,20 @@ export default {
|
|||
const param = { id: row.id, taskId: row.taskId }
|
||||
this.$modal
|
||||
.confirm('是否确认发布所选择的数据项？')
|
||||
.then(function () {
|
||||
return applySend(param)
|
||||
})
|
||||
.then(() => {
|
||||
this.getList()
|
||||
this.$modal.msgSuccess('发布成功')
|
||||
.then(async () => {
|
||||
try {
|
||||
if (this.isSubmit) return
|
||||
this.isSubmit = true
|
||||
this.loading = true
|
||||
await applySend(param)
|
||||
this.getList()
|
||||
this.$modal.msgSuccess('发布成功')
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ handleSend ~ error:', error)
|
||||
} finally {
|
||||
this.isSubmit = false
|
||||
this.loading = false
|
||||
}
|
||||
})
|
||||
.catch(() => {})
|
||||
},
|
||||
|
|
@ -1191,11 +1200,19 @@ export default {
|
|||
})
|
||||
return
|
||||
} else {
|
||||
if (this.isSubmit) return
|
||||
this.isSubmit = true
|
||||
this.loading = true
|
||||
applySendAll(this.sendTemp).then(response => {
|
||||
this.isSubmit = false
|
||||
this.loading = false
|
||||
if (response.code == 200) {
|
||||
this.$modal.msgSuccess('发布成功')
|
||||
}
|
||||
this.getList()
|
||||
}).catch(() => {
|
||||
this.isSubmit = false
|
||||
this.loading = false
|
||||
})
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1142,7 +1142,7 @@ export default {
|
|||
this.handleOutQuery()
|
||||
},
|
||||
|
||||
saveCodeOut() {
|
||||
async saveCodeOut() {
|
||||
console.log(this.maCodeList)
|
||||
console.log(this.outNum)
|
||||
|
||||
|
|
@ -1151,6 +1151,19 @@ export default {
|
|||
} else if (this.maCodeList.length > this.outNum) {
|
||||
this.$modal.msgError('出库编码数量不可大于待出库数量！')
|
||||
} else {
|
||||
// 弹框确认
|
||||
let isConfirm = false
|
||||
try {
|
||||
const res = await this.$modal.confirm('是否确认提交？')
|
||||
console.log('🚀 ~ saveCodeOut ~ res:', res)
|
||||
isConfirm = res === 'confirm'
|
||||
} catch (err) {
|
||||
console.log('🚀 ~ saveCodeOut ~ err:', err) // err === 'cancel'
|
||||
isConfirm = false
|
||||
}
|
||||
console.log('🚀 ~ saveCodeOut ~ isConfirm:', isConfirm)
|
||||
if (!isConfirm) return
|
||||
|
||||
if (!this.keyId) {
|
||||
this.keyId = this.userId + '-' + new Date().getTime()
|
||||
}
|
||||
|
|
@ -1284,7 +1297,20 @@ export default {
|
|||
// },
|
||||
|
||||
//数量出库保存
|
||||
saveNumOut() {
|
||||
async saveNumOut() {
|
||||
// 弹框确认
|
||||
let isConfirm = false
|
||||
try {
|
||||
const res = await this.$modal.confirm('是否确认提交？')
|
||||
console.log('🚀 ~ res:', res)
|
||||
isConfirm = res === 'confirm'
|
||||
} catch (err) {
|
||||
console.log('🚀 ~ err:', err) // err === 'cancel'
|
||||
isConfirm = false
|
||||
}
|
||||
console.log('🚀 ~ isConfirm:', isConfirm)
|
||||
if (!isConfirm) return
|
||||
|
||||
this.outNumList[0].carCode = this.numOutForm.carCode
|
||||
this.outNumList[0].remark = this.numOutForm.remark
|
||||
this.outNumList[0].leaseType = 0
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="出场时间" prop="outFacTime">
|
||||
<el-form-item label="出厂时间" prop="outFacTime">
|
||||
<el-date-picker type="date" placeholder="选择日期" v-model="form.outFacTime" style="width: 100%;"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
|
|
@ -460,6 +460,7 @@
|
|||
return time.getTime() > Date.now();
|
||||
}
|
||||
}"
|
||||
:clearable="false"
|
||||
@change="handleCurrentCheckDateChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -469,9 +470,17 @@
|
|||
<el-date-picker
|
||||
v-model="authForm.nextCheckDate"
|
||||
type="date"
|
||||
placeholder="自动生成"
|
||||
placeholder="请选择日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
disabled
|
||||
:picker-options="{
|
||||
disabledDate: (time) => {
|
||||
if (!authForm.currentCheckDate) {
|
||||
return false; // 没有选择本次检验时间时，不限制
|
||||
}
|
||||
return time.getTime() < new Date(authForm.currentCheckDate).getTime();
|
||||
}
|
||||
}"
|
||||
:clearable="false"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,6 @@
|
|||
<el-input-number
|
||||
v-else
|
||||
v-model="scope.row.num"
|
||||
:precision="0"
|
||||
:step="1"
|
||||
:min="0"
|
||||
:max="9999"
|
||||
|
|
@ -464,6 +463,13 @@ export default {
|
|||
},
|
||||
// 数量/备注变更
|
||||
handleBlur(row) {
|
||||
console.log('🚀 ~ handleBlur ~ row.unitValue:', row.unitValue)
|
||||
if (row.unitValue == 1) {
|
||||
row.num = Number(String(row.num).replace(/[^\d.]/g, ''))
|
||||
} else {
|
||||
row.num = Number(String(row.num).replace(/[^\d]/g, ''))
|
||||
}
|
||||
console.log('🚀 ~ handleBlur ~ row:', row.num)
|
||||
try {
|
||||
row.isEdit = false
|
||||
const params = {
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
|
||||
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<el-table-column type="selection" align="center" :selectable="selectable"/>
|
||||
<el-table-column label="序号" align="center" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
|
||||
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column align="center" label="序号" type="index"/> -->
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
<el-table v-loading="loading" :data="tableList" border :max-height="650">
|
||||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="退料单位" align="center" prop="backUnitName" width="150"/>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
<el-table v-loading="loading" :data="tableList" border :max-height="650">
|
||||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="退料单位" align="center" prop="backUnitName" />
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.$index == 0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位名称" align="center" prop="backUnit" width="180" />
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
<el-table v-loading="loading" :data="tableList" border>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
<el-table v-loading="loading" :data="tableList" border :max-height="650">
|
||||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工程名称" align="center" prop="proName" width="180"/>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库信息" align="center" prop="whHouseName" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
<el-table v-loading="loading" :data="tableList" border :max-height="650">
|
||||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="协议号" align="center" prop="agreementCode" width="140"/>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="协议号" align="center" prop="agreementCode" width="140"/>
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
/>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
<el-table v-loading="loading" :data="tableList" :max-height="650">
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
|
||||
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index == 0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工程名称" align="center" prop="proName" width="200" />
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index == 0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工器具名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
<el-table-column label="序号" align="center" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index == 0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工器具名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
|
||||
|
|
|
|||
|
|
@ -143,20 +143,20 @@
|
|||
<el-table-column align="center" label="预领数量" prop="preNum" />
|
||||
<el-table-column label="出库数量" prop="outNum" align="center">
|
||||
<template v-slot="scope">
|
||||
<el-input
|
||||
<el-input-number
|
||||
v-if="scope.row.manageType == '1'"
|
||||
v-model.number="scope.row.outNum"
|
||||
controls-position="right"
|
||||
type="number"
|
||||
style="width: 100%"
|
||||
:min="1"
|
||||
@input="
|
||||
:min="0"
|
||||
:precision="3"
|
||||
@change="
|
||||
v =>
|
||||
scope.row.unitValue == 1
|
||||
? (scope.row.outNum = Number(v.replace(/[^\d.]/g, '')))
|
||||
: (scope.row.outNum = Number(v.replace(/[^\d]/g, '')))
|
||||
? (scope.row.outNum = Number(String(v).replace(/[^\d.]/g, '')))
|
||||
: (scope.row.outNum = Number(String(v).replace(/[^\d]/g, '')))
|
||||
"
|
||||
></el-input>
|
||||
></el-input-number>
|
||||
<el-button v-else size="mini" type="text" @click="handleOutCode(scope.row)">
|
||||
{{ scope.row.maCodeList ? scope.row.maCodeList.length : 0 }}
|
||||
</el-button>
|
||||
|
|
|
|||
Loading…
Reference in New Issue