|
|
|
|
@ -3,120 +3,76 @@ |
|
|
|
|
<el-dialog :close-on-click-modal="false" :title="outDialogTiltle" :visible.sync="outDialogVisible" |
|
|
|
|
:append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen> |
|
|
|
|
<!-- 基本信息 --> |
|
|
|
|
<el-form :model="sizeForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic"> |
|
|
|
|
<div class="form-title"> 基本信息</div> |
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="12" v-show="sizeForm.options == 1 && outDialogType != 'add'"> |
|
|
|
|
<el-form-item label="出库单号"> |
|
|
|
|
<el-input v-model="sizeForm.orderNo" disabled></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="出库申请时间"> |
|
|
|
|
<el-date-picker v-model="sizeForm.outDate" type="date" placeholder="选择日期" style="width: 100%;" disabled> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="事由"> |
|
|
|
|
<el-input v-model="sizeForm.reason" :disabled="outDialogType == 'details'"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="物资类型"> |
|
|
|
|
<el-select v-model="sizeForm.materialType" placeholder="请选择" style="width: 100%;" |
|
|
|
|
:disabled="outDialogType == 'details'"> |
|
|
|
|
<el-option label="办公室物资" value="1"></el-option> |
|
|
|
|
<el-option label="其他物资" value="2"></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="选项"> |
|
|
|
|
<el-radio-group v-model="sizeForm.options" @change="radioChange()" :disabled="outDialogType == 'details'"> |
|
|
|
|
<el-radio :label="1" :disabled="sizeForm.type == 2">批量选择</el-radio> |
|
|
|
|
<el-radio :label="2">单项选择</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12" v-if="sizeForm.options === 2"> |
|
|
|
|
<el-form-item label="选项"> |
|
|
|
|
<el-radio-group v-model="sizeForm.radio" :disabled="outDialogType == 'details'"> |
|
|
|
|
<el-radio :label="1">易耗品</el-radio> |
|
|
|
|
<el-radio :label="2">耐用品</el-radio> |
|
|
|
|
<el-radio :label="3">全部</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12" v-if="sizeForm.options == 1"> |
|
|
|
|
<el-form-item label="需求单名称"> |
|
|
|
|
<el-input v-model="sizeForm.demandEndInfo" disabled></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<div class="form-title">{{ outDate }} 出库信息：</div> |
|
|
|
|
<el-button type="primary" size="mini" style="margin-bottom: 18px;" @click="inTableAdd()" |
|
|
|
|
v-if="sizeForm.options == 2">新增</el-button> |
|
|
|
|
<el-table :data="sizeForm.inTableData" border style="width: 100%"> |
|
|
|
|
<el-table-column prop="materialCode" label="物资编码"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="materialName" label="物资名称"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-select v-model="scope.row.materialitem" placeholder="请选择物资名称" style="width: 100%;" |
|
|
|
|
@change="handleMaterialChange(scope.row.materialitem, scope.$index)" |
|
|
|
|
v-if='inDialogType != "details" && sizeForm.options == 2' value-key="id"> |
|
|
|
|
<el-option v-for="item in materials" :key="item.materialId" :label="item.materialName" :value="item"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
<span v-else> {{ scope.row.materialName }}</span> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="model" label="规格"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="type" label="类别"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
{{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="type" label="出库类型"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
{{ scope.row.type === "NY" ? "出库单" : (scope.row.type === "YH" ? "发放单" : "") }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="unit" label="单位"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="departmentName" label="部门" v-if="sizeForm.options === 2"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;" |
|
|
|
|
v-if='inDialogType != "details"'> |
|
|
|
|
<el-option v-for="item in list" :key="item.departmentId" :label="item.department" |
|
|
|
|
:value="item.departmentId"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
<span v-else> {{ scope.row.departmentName }}</span> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="applicationQuantity" label="申请数量" v-if="sizeForm.options == 1"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
{{ scope.row.outboundQuantity || 0 }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="theOutboundQuantity" label="本次出库数量"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="0" style="width: 100%;" |
|
|
|
|
@change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number> |
|
|
|
|
<!-- <span v-else>{{ scope.row.theOutboundQuantity || 0 }}</span> --> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
<div class="form-title" v-if="outDialogType !== 'details'">出库账目表格：</div> |
|
|
|
|
<el-table :data="sizeForm.inTableData" border style="width: 100%" v-if="outDialogType !== 'details'"> |
|
|
|
|
<el-table-column prop="date" label="当前库存" width="100"> |
|
|
|
|
<div class="dialog-content"> |
|
|
|
|
<el-form :model="sizeForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic"> |
|
|
|
|
<div class="form-title"> 基本信息</div> |
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="12" v-show="sizeForm.options == 1 && outDialogType != 'add'"> |
|
|
|
|
<el-form-item label="出库单号"> |
|
|
|
|
<el-input v-model="sizeForm.orderNo" disabled></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="出库申请日期"> |
|
|
|
|
<el-date-picker v-model="sizeForm.outDate" type="date" placeholder="选择日期" style="width: 100%;" disabled> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="事由"> |
|
|
|
|
<el-input v-model="sizeForm.reason" :disabled="outDialogType == 'details'"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="物资类型"> |
|
|
|
|
<el-select v-model="sizeForm.materialType" placeholder="请选择" style="width: 100%;" |
|
|
|
|
:disabled="outDialogType == 'details'"> |
|
|
|
|
<el-option label="办公室物资" value="1"></el-option> |
|
|
|
|
<el-option label="其他物资" value="2"></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="选项"> |
|
|
|
|
<el-radio-group v-model="sizeForm.options" @change="radioChange()" |
|
|
|
|
:disabled="outDialogType == 'details'"> |
|
|
|
|
<el-radio :label="1" :disabled="sizeForm.type == 2"><span @click="closeHandle">批量选择</span></el-radio> |
|
|
|
|
<el-radio :label="2">单项选择</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12" v-if="sizeForm.options === 2"> |
|
|
|
|
<el-form-item label="选项"> |
|
|
|
|
<el-radio-group v-model="sizeForm.optionType" :disabled="outDialogType == 'details'" |
|
|
|
|
@change="getMaterialList"> |
|
|
|
|
<el-radio label="YH">易耗品</el-radio> |
|
|
|
|
<el-radio label="NY">耐用品</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12" v-if="sizeForm.options == 1"> |
|
|
|
|
<el-form-item label="需求单名称"> |
|
|
|
|
<el-input v-model="sizeForm.demandEndInfo" disabled></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<div class="form-title">{{ outDate }} 出库信息：</div> |
|
|
|
|
<el-button type="primary" size="mini" style="margin-bottom: 18px;" @click="inTableAdd()" |
|
|
|
|
v-if="sizeForm.options == 2">新增</el-button> |
|
|
|
|
<el-table :data="sizeForm.inTableData" border style="width: 100%"> |
|
|
|
|
<el-table-column prop="materialCode" label="物资编码"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="materialName" label="物资名称"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-select v-model="scope.row.materialitem" placeholder="请选择物资名称" style="width: 100%;" |
|
|
|
|
@change="handleMaterialChange(scope.row.materialitem, scope.$index)" |
|
|
|
|
v-if='inDialogType != "details" && sizeForm.options == 2 && sizeForm.optionType == "YH"' |
|
|
|
|
value-key="id"> |
|
|
|
|
<el-option v-for="item in materials" :key="item.materialId" :label="item.materialName" :value="item"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
<span v-else> {{ scope.row.materialName }}</span> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="model" label="规格"> |
|
|
|
|
</el-table-column> |
|
|
|
|
@ -130,25 +86,85 @@ |
|
|
|
|
{{ scope.row.type === "NY" ? "出库单" : (scope.row.type === "YH" ? "发放单" : "") }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="departmentName" label="部门" v-if="sizeForm.options == 2"> |
|
|
|
|
<el-table-column prop="unit" label="单位"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column label="部门" prop="departmentName" v-if="sizeForm.options === 2 && sizeForm.optionType" |
|
|
|
|
:key="'account-dept-' + sizeForm.options"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<span> |
|
|
|
|
{{ getDepartmentName(scope.row.department) }} |
|
|
|
|
</span> |
|
|
|
|
<el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;" |
|
|
|
|
v-if='inDialogType != "details"'> |
|
|
|
|
<el-option v-for="item in list" :key="item.departmentId" :label="item.department" |
|
|
|
|
:value="item.departmentId"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
<span v-else> {{ scope.row.departmentName }}</span> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="theOutboundQuantity" label="本次出库数量"> |
|
|
|
|
<el-table-column prop="applicationQuantity" label="申请数量" v-if="sizeForm.options == 1"> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="date" label="出库信息" v-if="sizeForm.options == 1"> |
|
|
|
|
<el-table-column prop="outboundQuantity" label="数量"> |
|
|
|
|
<el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
{{ scope.row.outboundQuantity || 0 }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
</el-form> |
|
|
|
|
<el-table-column prop="theOutboundQuantity" label="本次出库数量"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="0" style="width: 100%;" |
|
|
|
|
@change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number> |
|
|
|
|
<!-- <span v-else>{{ scope.row.theOutboundQuantity || 0 }}</span> --> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column label="操作" v-if="sizeForm.optionType === 'YH' || inBatchForm.optionType === 'YH'" |
|
|
|
|
style="text-align: center;"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<div style="text-align: center;"> |
|
|
|
|
<el-button type="text" size="mini" @click="handleDelete(scope.$index, scope.row)"> |
|
|
|
|
删除 |
|
|
|
|
</el-button> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
<div class="form-title" v-if="outDialogType !== 'details'">出库账目表格：</div> |
|
|
|
|
<el-table :data="sizeForm.inTableData" border style="width: 100%" v-if="outDialogType !== 'details'"> |
|
|
|
|
<el-table-column prop="date" label="当前库存" width="100"> |
|
|
|
|
<el-table-column prop="materialCode" label="物资编码"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="materialName" label="物资名称"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="model" label="规格"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="type" label="类别"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
{{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="type" label="出库类型"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
{{ scope.row.type === "NY" ? "出库单" : (scope.row.type === "YH" ? "发放单" : "") }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="departmentName" label="部门" v-if="sizeForm.options == 2" |
|
|
|
|
:key="'account-dept-' + sizeForm.options"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<span> |
|
|
|
|
{{ getDepartmentName(scope.row.department) }} |
|
|
|
|
</span> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="theOutboundQuantity" label="本次出库数量"> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="date" label="出库信息" v-if="sizeForm.options == 1"> |
|
|
|
|
<el-table-column prop="outboundQuantity" label="数量"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
{{ scope.row.outboundQuantity || 0 }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
</el-form> |
|
|
|
|
</div> |
|
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
|
<el-button @click="handleCloseDetail()">取 消</el-button> |
|
|
|
|
<el-button type="primary" @click="submit(1)">暂存</el-button> |
|
|
|
|
@ -163,8 +179,10 @@ |
|
|
|
|
<el-col :span="24"> |
|
|
|
|
<el-form-item label="需求单"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-select v-model="inBatchForm.batchType" placeholder="请选择需求单" style="width: 100%;"> |
|
|
|
|
<el-option v-for="item in quarterList" :key="item.ids" :label="item.quarterName" :value="item.ids"> |
|
|
|
|
<el-select v-model="inBatchForm.batchType" placeholder="请选择需求单" style="width: 100%;" |
|
|
|
|
@change="resetHandle"> |
|
|
|
|
<el-option v-for="item in quarterList" :key="item.ids" :label="item.quarterName" :value="item.ids" |
|
|
|
|
:clearable="true"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</template> |
|
|
|
|
@ -172,7 +190,8 @@ |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="24"> |
|
|
|
|
<el-form-item label="部门"> |
|
|
|
|
<el-select v-model="inBatchForm.department" placeholder="请选择" style="width: 100%;"> |
|
|
|
|
<el-select v-model="inBatchForm.department" placeholder="请选择" style="width: 100%;" :clearable="true" |
|
|
|
|
@change="depchange"> |
|
|
|
|
<el-option v-for="item in departmentList" :key="item.departmentId" :label="item.department" |
|
|
|
|
:value="item.departmentId"> |
|
|
|
|
</el-option> |
|
|
|
|
@ -181,10 +200,9 @@ |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="24"> |
|
|
|
|
<el-form-item label="选项"> |
|
|
|
|
<el-radio-group v-model="sizeForm.radio" :disabled="outDialogType == 'details'"> |
|
|
|
|
<el-radio :label="1">易耗品</el-radio> |
|
|
|
|
<el-radio :label="2">耐用品</el-radio> |
|
|
|
|
<el-radio :label="3">全部</el-radio> |
|
|
|
|
<el-radio-group v-model="inBatchForm.optionType" :disabled="outDialogType == 'details'"> |
|
|
|
|
<el-radio label="YH">易耗品</el-radio> |
|
|
|
|
<el-radio label="NY">耐用品</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
@ -199,6 +217,13 @@ |
|
|
|
|
<!-- 选择弹窗 --> |
|
|
|
|
<el-dialog :close-on-click-modal="false" title="选择耐用品" :visible.sync="goodsVisible" :append-to-body="true" |
|
|
|
|
width="70%"> |
|
|
|
|
<!-- 搜索区域 --> |
|
|
|
|
<div class="search-container" style="margin-bottom: 15px;"> |
|
|
|
|
<el-input v-model="searchKeyword" placeholder="请输入物资名称搜索" clearable style="width: 300px;" |
|
|
|
|
@keyup.enter.native="handleSearch"> |
|
|
|
|
<el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button> |
|
|
|
|
</el-input> |
|
|
|
|
</div> |
|
|
|
|
<el-table :data="goodsList" border style="width: 100%" @selection-change="goodsListSelectionChange"> |
|
|
|
|
<el-table-column type="selection" width="55"> |
|
|
|
|
</el-table-column> |
|
|
|
|
@ -215,7 +240,7 @@ |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="unit" label="单位"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="departmentName" label="部门"> |
|
|
|
|
<el-table-column prop="departmentName" label="部门" v-if="sizeForm.options == 2"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column prop="applicationQuantity" label="申请数量"> |
|
|
|
|
</el-table-column> |
|
|
|
|
@ -224,24 +249,30 @@ |
|
|
|
|
{{ scope.row.outboundQuantity || 0 }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<!-- <el-table-column prop="theOutboundQuantity" label="本次出库数量"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="1" style="width: 100%;" |
|
|
|
|
@change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> --> |
|
|
|
|
</el-table> |
|
|
|
|
|
|
|
|
|
<!-- 分页组件 --> |
|
|
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" |
|
|
|
|
:page-sizes="[5, 10, 20, 50]" :page-size="pageSize" :total="total" |
|
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
|
</el-pagination> |
|
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
|
<el-button @click="goodsVisible = false">取 消</el-button> |
|
|
|
|
<el-button type="primary" @click="goodsSubmit()">确 定</el-button> |
|
|
|
|
</span> |
|
|
|
|
</el-dialog> |
|
|
|
|
<consumableDialog v-if="consumableVisible" :consumableVisible='consumableVisible' :demandDialogTitle="demandDialogTitle" |
|
|
|
|
@handleCloseDetail="handleCloseDetail"> |
|
|
|
|
</consumableDialog> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
</template> |
|
|
|
|
<script> |
|
|
|
|
import { getQuarterList, getDepartmentList, getDetailedList, getDetailedItems, submitData, getMaterialList, editList } from "@/api/firstOrder/outbound"; |
|
|
|
|
import consumableDialog from './consumableDialog.vue' |
|
|
|
|
export default { |
|
|
|
|
components: { |
|
|
|
|
consumableDialog, |
|
|
|
|
}, |
|
|
|
|
props: { |
|
|
|
|
repairVisible: { |
|
|
|
|
type: Boolean, |
|
|
|
|
@ -266,7 +297,9 @@ export default { |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
demandDialogTitle: '耐用品出库', |
|
|
|
|
goodsVisible: false, |
|
|
|
|
consumableVisible: false, //单条耐耗品弹窗显示 |
|
|
|
|
quarterList: [], |
|
|
|
|
departmentList: [], |
|
|
|
|
outDialogVisible: false, |
|
|
|
|
@ -279,16 +312,17 @@ export default { |
|
|
|
|
demandEndInfo: '',//需求单名称 |
|
|
|
|
outDate: '',//出库时间 |
|
|
|
|
options: 2,//出库类型 |
|
|
|
|
radio: 1, // 1易耗品 2耐用品 |
|
|
|
|
optionType: '', // 1易耗品 2耐用品 |
|
|
|
|
materialType: '1',//物资类型 |
|
|
|
|
status: '',//1暂存 2提交 |
|
|
|
|
// materialld: '',//物资Id |
|
|
|
|
userInfoVO: { |
|
|
|
|
userId: "用户ID", |
|
|
|
|
name: "用户名称" |
|
|
|
|
name: "用户名称", |
|
|
|
|
mainErDepartment: "1", |
|
|
|
|
mainErDepartmentName: "主管部门名称", |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
uniqueList: [], |
|
|
|
|
goodsList: [], |
|
|
|
|
goodsSelectList: [], |
|
|
|
|
inTableData: [], |
|
|
|
|
@ -296,10 +330,20 @@ export default { |
|
|
|
|
batchType: '',//需求单选择类型 |
|
|
|
|
inBatchForm: { |
|
|
|
|
batchType: '', |
|
|
|
|
department: '' |
|
|
|
|
department: '', |
|
|
|
|
optionType: '', |
|
|
|
|
}, |
|
|
|
|
quarterYearMap: {}, |
|
|
|
|
quarterQuarterMap: {} |
|
|
|
|
quarterQuarterMap: {}, |
|
|
|
|
rules: { |
|
|
|
|
reason: [ |
|
|
|
|
{ required: true, message: '事由不能为空', trigger: 'blur' } |
|
|
|
|
], |
|
|
|
|
materialType: [ |
|
|
|
|
{ required: true, message: '请选择物资类型', trigger: 'change' } |
|
|
|
|
] |
|
|
|
|
// 其他字段校验规则 |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
@ -308,13 +352,15 @@ export default { |
|
|
|
|
const year = now.getFullYear(); |
|
|
|
|
const month = String(now.getMonth() + 1).padStart(2, '0'); |
|
|
|
|
const day = String(now.getDate()).padStart(2, '0') |
|
|
|
|
const hour = String(now.getHours()).padStart(2, '0') |
|
|
|
|
const minute = String(now.getMinutes()).padStart(2, '0') |
|
|
|
|
const second = String(now.getSeconds()).padStart(2, '0') |
|
|
|
|
return `${year}-${month}-${day} ${hour}:${minute}:${second}` |
|
|
|
|
// const hour = String(now.getHours()).padStart(2, '0') |
|
|
|
|
// const minute = String(now.getMinutes()).padStart(2, '0') |
|
|
|
|
// const second = String(now.getSeconds()).padStart(2, '0') |
|
|
|
|
// return `${year}-${month}-${day} ${hour}:${minute}:${second}` |
|
|
|
|
return `${year}-${month}-${day}` |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
|
|
|
|
|
this.outDialogVisible = this.repairVisible |
|
|
|
|
if (this.outDialogType == 'add') { |
|
|
|
|
this.addInit() |
|
|
|
|
@ -322,22 +368,127 @@ export default { |
|
|
|
|
this.inInit() |
|
|
|
|
} |
|
|
|
|
this.getDetailedItems() |
|
|
|
|
this.getMaterialList() |
|
|
|
|
// this.getMaterialList() |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
// // 获取物资列表 |
|
|
|
|
// async getMaterialList() { |
|
|
|
|
// const { data: res } = await this.$http.get('material/getMaterialList') |
|
|
|
|
// if (res.code !== 200) return this.$message.error(res.msg) |
|
|
|
|
// this.materialList = res.data |
|
|
|
|
// }, |
|
|
|
|
// 处理搜索 |
|
|
|
|
async handleSearch() { |
|
|
|
|
// 重置当前页 |
|
|
|
|
this.currentPage = 1; |
|
|
|
|
await this.loadGoodsList(); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 分页大小改变 |
|
|
|
|
handleSizeChange(val) { |
|
|
|
|
this.pageSize = val; |
|
|
|
|
this.currentPage = 1; |
|
|
|
|
this.loadGoodsList(); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 当前页改变 |
|
|
|
|
handleCurrentChange(val) { |
|
|
|
|
this.currentPage = val; |
|
|
|
|
this.loadGoodsList(); |
|
|
|
|
}, |
|
|
|
|
// 加载商品列表数据（包含分页和搜索） |
|
|
|
|
// async loadGoodsList() { |
|
|
|
|
// try { |
|
|
|
|
// const res = await getMaterialList({ |
|
|
|
|
// optionType: 'NY', // 耐用品 |
|
|
|
|
// // pageNum: this.currentPage, |
|
|
|
|
// // pageSize: this.pageSize, |
|
|
|
|
// // keyword: this.searchKeyword // 搜索关键词 |
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
// if (res.data && res.data.result) { |
|
|
|
|
// // this.goodsList = res.data.result.list; // 列表数据 |
|
|
|
|
// this.goodsList = res.data.result; // 列表数据 |
|
|
|
|
// this.total = res.data.result.total; // 总条数 |
|
|
|
|
// } |
|
|
|
|
// } catch (error) { |
|
|
|
|
// this.$message.error("获取商品列表失败，请重试"); |
|
|
|
|
// } |
|
|
|
|
// }, |
|
|
|
|
|
|
|
|
|
// 选择变化时保存到数组 |
|
|
|
|
goodsListSelectionChange(val) { |
|
|
|
|
this.goodsSelectList = JSON.parse(JSON.stringify(val)); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 确认选择 |
|
|
|
|
goodsSubmit() { |
|
|
|
|
if (this.goodsSelectList.length > 0) { |
|
|
|
|
const newItems = this.goodsSelectList.map(item => ({ |
|
|
|
|
...item, |
|
|
|
|
materialId: item.materialId, |
|
|
|
|
materialCode: item.materialCode, |
|
|
|
|
materialName: item.materialName, |
|
|
|
|
model: item.model, |
|
|
|
|
type: item.type, |
|
|
|
|
unit: item.unit, |
|
|
|
|
department: item.departmentId, |
|
|
|
|
departmentName: item.departmentName, |
|
|
|
|
theOutboundQuantity: 0 |
|
|
|
|
})); |
|
|
|
|
|
|
|
|
|
this.sizeForm.inTableData.push(...newItems); |
|
|
|
|
this.goodsVisible = false; |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning('请先勾选需要添加的数据'); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
depchange(value) { |
|
|
|
|
this.departmentList = this.departmentList |
|
|
|
|
}, |
|
|
|
|
//关闭 |
|
|
|
|
handleBatchClose() { |
|
|
|
|
this.inBatchDialogVisible = false |
|
|
|
|
}, |
|
|
|
|
// 添加出库数据 |
|
|
|
|
inTableAdd() { |
|
|
|
|
const requiredFields = [ |
|
|
|
|
{ value: this.sizeForm.reason, message: '请填写事由' }, |
|
|
|
|
{ value: this.sizeForm.materialType, message: '请选择物资类型' }, |
|
|
|
|
{ value: this.sizeForm.optionType, message: '请选择类别（易耗品/耐用品）' } |
|
|
|
|
]; |
|
|
|
|
// 检查所有必填项 |
|
|
|
|
for (const field of requiredFields) { |
|
|
|
|
if (!field.value) { |
|
|
|
|
this.$message.warning(field.message); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
this.sizeForm.inTableData.push({}) |
|
|
|
|
}, |
|
|
|
|
addInit() { |
|
|
|
|
this.sizeForm.outDate = new Date()//出库时间 |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//本次出库数量 |
|
|
|
|
syncInboundQuantity(row) { |
|
|
|
|
row.theOutboundQuantity = Number(row.theOutboundQuantity); |
|
|
|
|
row.theOutboundQuantity = Number(row.theOutboundQuantity) |
|
|
|
|
if (this.sizeForm.options === 1) { |
|
|
|
|
const maxAllowQuantity = (row.applicationQuantity || 0) - (row.outboundQuantity || 0); |
|
|
|
|
if (row.theOutboundQuantity > maxAllowQuantity) { |
|
|
|
|
this.$message.error(`本次出库数量不能大于${maxAllowQuantity}`); |
|
|
|
|
row.theOutboundQuantity = maxAllowQuantity; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//关闭新增弹窗 |
|
|
|
|
handleCloseDetail() { |
|
|
|
|
this.outDialogVisible = false |
|
|
|
|
this.consumableVisible = false |
|
|
|
|
this.$emit('handleCloseDetail') |
|
|
|
|
}, |
|
|
|
|
// 获取需求单列表 |
|
|
|
|
// 获取批量需求单列表 |
|
|
|
|
async getQuarterList() { |
|
|
|
|
try { |
|
|
|
|
const res = await getQuarterList() |
|
|
|
|
@ -352,12 +503,10 @@ export default { |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} catch (error) { |
|
|
|
|
console.error('获取需求单列表失败:', error) |
|
|
|
|
this.$message.error('获取需求单列表失败') |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 监听需求单选择变化，获取部门列表 |
|
|
|
|
// 批量需求单选择变化，获取部门列表 |
|
|
|
|
async onQuarterSelectChange(ids) { |
|
|
|
|
if (!ids) return |
|
|
|
|
const year = this.quarterYearMap[ids] |
|
|
|
|
@ -370,6 +519,7 @@ export default { |
|
|
|
|
}) |
|
|
|
|
if (res.data && res.data.result) { |
|
|
|
|
this.departmentList = res.data.result |
|
|
|
|
console.log(this.departmentList, 'departmentList') |
|
|
|
|
} else { |
|
|
|
|
this.departmentList = [] |
|
|
|
|
} |
|
|
|
|
@ -381,11 +531,7 @@ export default { |
|
|
|
|
this.departmentList = [] |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 采购单选择弹框关闭 |
|
|
|
|
handleBatchClose() { |
|
|
|
|
this.inBatchDialogVisible = false |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
//批量选择弹窗确定 |
|
|
|
|
async batchSubmit() { |
|
|
|
|
if (!this.inBatchForm.batchType) { |
|
|
|
|
this.$message.error('请选择需求单'); |
|
|
|
|
@ -395,23 +541,28 @@ export default { |
|
|
|
|
this.$message.error('请选择部门'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (!this.inBatchForm.optionType) { |
|
|
|
|
this.$message.error('请选择类别'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
const res = await getDetailedList({ |
|
|
|
|
ids: this.inBatchForm.batchType, |
|
|
|
|
departmentId: this.inBatchForm.department |
|
|
|
|
departmentId: this.inBatchForm.department, |
|
|
|
|
optionType: this.inBatchForm.optionType, |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
if (res.data && res.data.result) { |
|
|
|
|
this.sizeForm.inTableData = res.data.result.uniqueList |
|
|
|
|
this.sizeForm.inTableData = res.data.result |
|
|
|
|
const selectedDept = this.departmentList.find( |
|
|
|
|
dept => dept.departmentId === this.inBatchForm.department |
|
|
|
|
); |
|
|
|
|
) |
|
|
|
|
const deptName = selectedDept ? selectedDept.department : ''; |
|
|
|
|
this.sizeForm.inTableData = res.data.result.uniqueList.map(item => ({ |
|
|
|
|
this.sizeForm.inTableData = res.data.result.map(item => ({ |
|
|
|
|
...item, |
|
|
|
|
IdDemandEndld: this.inBatchForm.batchType, |
|
|
|
|
// department: this.inBatchForm.department, |
|
|
|
|
department: deptName |
|
|
|
|
})); |
|
|
|
|
})) |
|
|
|
|
this.inBatchDialogVisible = false; |
|
|
|
|
const selectedQuarter = this.quarterList.find( |
|
|
|
|
item => item.ids === this.inBatchForm.batchType |
|
|
|
|
@ -419,24 +570,23 @@ export default { |
|
|
|
|
if (selectedQuarter) { |
|
|
|
|
this.sizeForm.demandEndInfo = selectedQuarter.quarterName; |
|
|
|
|
} |
|
|
|
|
//当radio是全部的时候 弹弹窗 |
|
|
|
|
if (this.sizeForm.radio === 3) { |
|
|
|
|
if (res.data.result.duplicateList != null && res.data.result.duplicateList.length > 0) { |
|
|
|
|
this.goodsVisible = true |
|
|
|
|
this.goodsList = res.data.result.duplicateList |
|
|
|
|
} |
|
|
|
|
if (this.inBatchForm.optionType === 'NY') { |
|
|
|
|
this.goodsVisible = true |
|
|
|
|
this.data.goodsList = res.data.result |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$forceUpdate(); |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning('未获取到详细数据'); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//选择回调函数 |
|
|
|
|
//批量选择耐用品选择回调函数 |
|
|
|
|
goodsListSelectionChange(val) { |
|
|
|
|
this.goodsSelectList = val |
|
|
|
|
}, |
|
|
|
|
//批量选择弹窗点击确认按钮 |
|
|
|
|
//批量选择耐用品弹窗点击确认按钮 |
|
|
|
|
goodsSubmit() { |
|
|
|
|
if (this.goodsSelectList.length > 0) { |
|
|
|
|
this.sizeForm.inTableData.push(...this.goodsSelectList); |
|
|
|
|
@ -466,8 +616,13 @@ export default { |
|
|
|
|
async getMaterialList() { |
|
|
|
|
this.loading = true |
|
|
|
|
try { |
|
|
|
|
const res = await getMaterialList(); |
|
|
|
|
this.materials = res.data.result |
|
|
|
|
|
|
|
|
|
if (this.sizeForm.optionType === "NY") { |
|
|
|
|
this.consumableVisible = true |
|
|
|
|
} else { |
|
|
|
|
const res = await getMaterialList({ optionType: this.sizeForm.optionType }) |
|
|
|
|
this.materials = res.data.result |
|
|
|
|
} |
|
|
|
|
} catch (error) { |
|
|
|
|
this.$message.error("获取数据来源失败，请重试"); |
|
|
|
|
} finally { |
|
|
|
|
@ -514,14 +669,22 @@ export default { |
|
|
|
|
// status == 1 暂存 ，2提交 |
|
|
|
|
this.sizeForm.status = index |
|
|
|
|
this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData |
|
|
|
|
this.sizeForm.inTableData.forEach(row => { |
|
|
|
|
row.departmentName = this.getDepartmentName(row.department); |
|
|
|
|
}); |
|
|
|
|
this.sizeForm.ldOneOutStorageDetailVOList.departmentName = this.sizeForm.inTableData.department |
|
|
|
|
|
|
|
|
|
let arr = this.departmentList.find(item => item.departmentId === this.inBatchForm.department || {}) |
|
|
|
|
this.sizeForm.ldOneOutStorageDetailVOList = this.sizeForm.inTableData.map(row => { |
|
|
|
|
const deptId = row.department |
|
|
|
|
const dept = this.list.find(item => item.departmentId === deptId); |
|
|
|
|
console.log(dept, 'dept') |
|
|
|
|
return { |
|
|
|
|
...row, |
|
|
|
|
department: this.sizeForm.options == '1' ? arr.departmentId : deptId, |
|
|
|
|
departmentName: this.sizeForm.options == '1' ? arr.department : dept.department, |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
console.log(this.sizeForm, '111') |
|
|
|
|
this.sizeForm.inTableData = [] |
|
|
|
|
try { |
|
|
|
|
const res = await submitData(this.sizeForm) |
|
|
|
|
console.log(this.sizeForm, '222') |
|
|
|
|
if (res.data.success) { |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
@ -566,29 +729,61 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 添加出库数据 |
|
|
|
|
inTableAdd() { |
|
|
|
|
this.sizeForm.inTableData.push({}) |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 选项选择 |
|
|
|
|
async radioChange() { |
|
|
|
|
// this.resetAllForms() |
|
|
|
|
this.sizeForm.inTableData = [] |
|
|
|
|
this.sizeForm.optionType = ''; |
|
|
|
|
if (this.sizeForm.options === 1) { |
|
|
|
|
await this.getQuarterList() |
|
|
|
|
this.inBatchDialogVisible = true |
|
|
|
|
this.$forceUpdate() |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$forceUpdate(); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
closeHandle() { |
|
|
|
|
this.inBatchForm.batchType = '', |
|
|
|
|
this.inBatchForm.department = '' |
|
|
|
|
this.inBatchForm.optionType = '' |
|
|
|
|
this.sizeForm.inTableData = [] |
|
|
|
|
this.getQuarterList() |
|
|
|
|
this.inBatchDialogVisible = true |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$forceUpdate(); |
|
|
|
|
}); |
|
|
|
|
// this.sizeForm.inTableData = [] |
|
|
|
|
}, |
|
|
|
|
// 删除表格行数据 |
|
|
|
|
handleDelete(index, row) { |
|
|
|
|
this.sizeForm.inTableData.splice(index, 1) |
|
|
|
|
this.$message.success('已成功删除该条记录') |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
watch: { |
|
|
|
|
// 监听需求单选择变化 |
|
|
|
|
'inBatchForm.batchType': function (newVal) { |
|
|
|
|
this.inBatchForm.department = '', |
|
|
|
|
this.inBatchForm.optionType = 1 |
|
|
|
|
if (newVal) { |
|
|
|
|
this.onQuarterSelectChange(newVal) |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
'sizeForm.optionType': function (newVal) { |
|
|
|
|
if (newVal) { |
|
|
|
|
this.sizeForm.inTableData = [] |
|
|
|
|
// this.getMaterialList() |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 当弹窗显示时加载数据 |
|
|
|
|
goodsVisible(newVal) { |
|
|
|
|
if (newVal) { |
|
|
|
|
// 重置搜索条件和分页 |
|
|
|
|
this.searchKeyword = ''; |
|
|
|
|
this.currentPage = 1; |
|
|
|
|
this.loadGoodsList(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -597,4 +792,16 @@ export default { |
|
|
|
|
.form-title { |
|
|
|
|
margin: 20px 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
::v-deep.el-dialog__footer { |
|
|
|
|
position: fixed !important; |
|
|
|
|
bottom: 0 !important; |
|
|
|
|
right: 0 !important; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
::v-deep.dialog-content { |
|
|
|
|
max-height: calc(100vh - 200px); |
|
|
|
|
overflow-y: auto; |
|
|
|
|
padding-right: 10px; |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
