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

This commit is contained in:
syruan 2024-04-18 16:34:23 +08:00
commit de7d8a3351
1 changed files with 579 additions and 799 deletions

View File

@ -18,11 +18,7 @@
/>
</el-form-item>
<el-form-item label="单位名称" prop="unitId">
<el-select
v-model="queryParams.unitId"
placeholder="请选择单位名称"
clearable
>
<el-select v-model="queryParams.unitId" placeholder="请选择单位名称" clearable>
<el-option
v-for="item in unitList"
filterable
@ -33,27 +29,12 @@
</el-select>
</el-form-item>
<el-form-item label="工程名称" prop="proId">
<el-select
v-model="queryParams.proId"
filterable
clearable
placeholder="请选择工程名称"
>
<el-option
v-for="item in proList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
<el-select v-model="queryParams.proId" filterable clearable placeholder="请选择工程名称">
<el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出库状态" prop="taskStatus">
<el-select
v-model="queryParams.taskStatus"
placeholder="请选择出库状态"
clearable
>
<el-select v-model="queryParams.taskStatus" placeholder="请选择出库状态" clearable>
<el-option
v-for="item in statusList"
filterable
@ -65,105 +46,38 @@
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="leaseList">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="领料单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料申请单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料申请工程"
align="center"
prop="proName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请数量"
align="center"
prop="preCountNum"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="申请时间"
align="center"
prop="createTimes"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="已出库数量"
align="center"
prop="alNum"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="出库状态"
align="center"
prop="taskName"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
<el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" />
<el-table-column label="申请数量" align="center" prop="preCountNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true"></el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" @click="handleView(scope.row)"
>查看</el-button
>
<el-button size="mini" @click="handleView(scope.row)">查看</el-button>
<el-button
size="mini"
type="primary"
v-if="scope.row.taskStatus != 35"
@click="handleOut(scope.row)"
>出库</el-button
>
>出库</el-button>
</template>
</el-table-column>
</el-table>
@ -177,12 +91,7 @@
/>
<!-- 出库弹窗 -->
<el-dialog
:title="title"
:visible.sync="openLeaseDevices"
width="1200px"
append-to-body
>
<el-dialog :title="title" :visible.sync="openLeaseDevices" width="1200px" append-to-body>
<el-form
:model="dialogQuery"
ref="dialogQuery"
@ -207,48 +116,22 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleDialogQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetDialogQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dialogList" height="600">
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="类型名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column
label="规格型号"
align="center"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="待出库数量"
align="center"
prop="outNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="已出库数量"
align="center"
prop="alNum"
:show-overflow-tooltip="true"
/>
<el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
<el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
<el-table-column
label="设备负责人"
align="center"
@ -265,22 +148,14 @@
<el-button
size="mini"
@click="codeOut(scope.row)"
v-if="
scope.row.manageType == 0 &&
scope.row.outNum != 0
"
>编码出库</el-button
>
v-if="scope.row.manageType == 0 && scope.row.outNum != 0"
>编码出库</el-button>
<el-button
size="mini"
type="primary"
v-if="
scope.row.manageType == 1 &&
scope.row.outNum != 0
"
v-if="(scope.row.manageType == 1 ||scope.row.manageType == 2)&& scope.row.outNum != 0"
@click="numOut(scope.row)"
>数量出库</el-button
>
>数量出库</el-button>
</template>
</el-table-column>
</el-table>
@ -295,12 +170,7 @@
</el-dialog>
<!-- 编码出库 -->
<el-dialog
:title="title"
:visible.sync="openCode"
width="1200px"
append-to-body
>
<el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
<el-form
:model="codeOutForm"
ref="codeOutForm"
@ -308,48 +178,25 @@
:inline="true"
label-width="100px"
>
<span style="margin-right: 50px">
待出库数量{{ outNum }}
</span>
<span style="margin-right: 50px">待出库数量{{ outNum }}</span>
<el-form-item label="请输入车牌号" prop="carCode">
<el-input v-model="codeOutForm.carCode" maxlength="20" />
</el-form-item>
<span style="margin-right: 50px; color: red">
部分设备出库时需进行装车,需记录车牌号码
</span>
<span style="margin-right: 50px; color: red">部分设备出库时需进行装车,需记录车牌号码</span>
</el-form>
<el-form
:model="outQuery"
ref="outQuery"
size="small"
:inline="true"
label-width="100px"
>
<el-form :model="outQuery" ref="outQuery" size="small" :inline="true" label-width="100px">
<el-form-item label="设备编码" prop="maCode">
<el-input v-model="outQuery.maCode" maxlength="20" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleOutQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetOutQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleOutQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetOutQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" size="mini" @click="saveCodeOut"
>出库</el-button
>
<el-button type="primary" size="mini" @click="saveCodeOut">出库</el-button>
</el-col>
</el-row>
<el-table
@ -358,37 +205,17 @@
height="500"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="selectable"
/>
<el-table-column type="selection" width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="类型名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column
label="规格型号"
align="center"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="设备编码"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="设备状态"
align="center"
prop="maStatus"
:show-overflow-tooltip="true"
/>
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
<el-table-column label="设备状态" align="center" prop="maStatus" :show-overflow-tooltip="true" />
</el-table>
<pagination
@ -401,73 +228,34 @@
</el-dialog>
<!-- 数量出库 -->
<el-dialog
:title="title"
:visible.sync="openNum"
width="1200px"
append-to-body
>
<el-form
:model="numOutForm"
ref="numOutForm"
size="small"
:inline="true"
label-width="100px"
>
<el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
<el-form :model="numOutForm" ref="numOutForm" size="small" :inline="true" label-width="100px">
<!-- <span style="margin-right: 50px;">
待出库数量{{outNum}}
</span> -->
</span>-->
<el-form-item label="请输入车牌号" prop="carCode">
<el-input v-model="numOutForm.carCode" maxlength="20" />
</el-form-item>
<span style="margin-right: 50px; color: red">
部分设备出库时需进行装车,需记录车牌号码
</span>
<span style="margin-right: 50px; color: red">部分设备出库时需进行装车,需记录车牌号码</span>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" size="mini" @click="saveNumOut"
>出库</el-button
>
<el-button type="primary" size="mini" @click="saveNumOut">出库</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="outNumList" height="500">
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="设备类型"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column label="设备类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column
label="规格型号"
align="center"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="库存数量"
align="center"
prop="num"
:show-overflow-tooltip="true"
/>
<el-table-column
label="待出库数量"
align="center"
prop="outNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="已出库数量"
align="center"
prop="alNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="出库数量"
align="center"
prop="inputNum"
>
<el-table-column label="库存数量" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
<el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
<el-table-column label="出库数量" align="center" prop="inputNum">
<template slot-scope="scope">
<el-input
v-model.number="scope.row.inputNum"
@ -486,7 +274,7 @@
</template>
<script>
import {
import {
getUnitData,
getProData,
getLeaseAuditList,
@ -494,12 +282,12 @@
getDetailsByTypeId,
submitOut,
submitNumOut,
} from '@/api/claimAndRefund/receive.js'
import { getTypeList } from '@/api/store/warehousing'
import { equipmentTypeTree } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
} from '@/api/claimAndRefund/receive.js'
import { getTypeList } from '@/api/store/warehousing'
import { equipmentTypeTree } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
name: 'receiveOut',
components: { Treeselect },
data() {
@ -588,42 +376,34 @@
methods: {
//
getUnitList() {
getUnitData().then((response) => {
getUnitData().then(response => {
this.unitList = response.data
})
},
//
getProList() {
getProData().then((response) => {
getProData().then(response => {
this.proList = response.data
})
},
getTypeList() {
getTypeList({ level: '3' }).then((response) => {
getTypeList({ level: '3' }).then(response => {
this.typeList = response.data
})
},
//
equipmentType() {
equipmentTypeTree().then((response) => {
equipmentTypeTree().then(response => {
this.equipmentTypeList = response.data
this.equipmentTypeList.forEach((item, index) => {
if (item.children && item.children.length > 0) {
item.children.forEach((item2, index2) => {
if (
item2.children &&
item2.children.length > 0
) {
item2.children.forEach((item3) => {
if (
item3.children &&
item3.children.length > 0
) {
item3.children.forEach((item4) => {
item4.machineTypeName =
item3.typeName
item4.specificationType =
item4.typeName
if (item2.children && item2.children.length > 0) {
item2.children.forEach(item3 => {
if (item3.children && item3.children.length > 0) {
item3.children.forEach(item4 => {
item4.machineTypeName = item3.typeName
item4.specificationType = item4.typeName
// this.$set(item4, 'purchasePrice', 0);
// this.$set(item4, 'purchaseNum', 1);
})
@ -648,7 +428,7 @@
/** 查询列表 */
getList() {
this.loading = true
getLeaseAuditList(this.queryParams).then((response) => {
getLeaseAuditList(this.queryParams).then(response => {
this.leaseList = response.data.rows
this.total = response.data.total
this.loading = false
@ -665,7 +445,7 @@
/** 查询列表 */
getDialogList() {
// console.log(this.dialogQuery)
getLeaseAuditListDetail(this.dialogQuery).then((response) => {
getLeaseAuditListDetail(this.dialogQuery).then(response => {
this.dialogList = response.data.rows
this.dialogTotal = response.data.total
})
@ -684,7 +464,7 @@
this.isView = false
this.dialogQuery.id = row.id
this.resetDialogQuery()
this.getDialogList()
// this.getDialogList()
},
//
@ -724,7 +504,7 @@
this.handleOutQuery()
},
getCodeList() {
getDetailsByTypeId(this.outQuery).then((response) => {
getDetailsByTypeId(this.outQuery).then(response => {
this.outCodeList = response.data.rows
if (response.data.total) {
this.outTotal = response.data.total
@ -733,7 +513,7 @@
},
//
handleSelectionChange(selection) {
this.maCodeList = selection.map((item) => item.maId)
this.maCodeList = selection.map(item => item.maId)
},
selectable(row) {
console.log(row)
@ -746,7 +526,7 @@
//
saveCodeOut() {
if (this.maCodeList.length <= this.outObj.outNum) {
let params = this.maCodeList.map((item) => {
let params = this.maCodeList.map(item => {
let obj = {
id: this.outObj.id,
maId: item,
@ -760,7 +540,7 @@
return obj
})
// console.log(params)
submitOut(params).then((response) => {
submitOut(params).then(response => {
this.$modal.msgSuccess('出库成功')
this.openCode = false
this.handleDialogQuery()
@ -774,7 +554,7 @@
saveNumOut() {
this.outNumList[0].carCode = this.numOutForm.carCode
let param = this.outNumList
submitNumOut(param).then((response) => {
submitNumOut(param).then(response => {
this.$modal.msgSuccess('出库成功')
this.openNum = false
this.handleDialogQuery()
@ -798,19 +578,19 @@
this.downloadJson(
'base/tm_task/export',
JSON.stringify(this.queryParams),
`领料出库_${new Date().getTime()}.xlsx`,
`领料出库_${new Date().getTime()}.xlsx`
)
},
},
}
}
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important;
margin-bottom: 10px;
}
.clickText {
}
.clickText {
color: #02a7f0;
cursor: pointer;
}
}
</style>