|
|
@@ -1,99 +1,84 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-form ref="dataForm" :model="dataForm" :rules="rules" label-width="120px" inline>
|
|
|
- <h3>通用入库单</h3>
|
|
|
- <!-- <el-form-item label="名称" prop="name">
|
|
|
- <el-input v-model="dataForm.name" :minlength="2" :maxlength="20" clearable
|
|
|
- placeholder="请输入名称" style="width:200px" :disabled="type === 'detail'"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
- <el-form-item label="入库时间" prop="serialDate">
|
|
|
+ <h3>盘点单</h3>
|
|
|
+ <el-form-item label="盘点时间" prop="serialDate">
|
|
|
<el-date-picker v-model="dataForm.serialDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
|
|
|
placeholder="选择日期时间" style="width:200px" :disabled="type === 'detail'">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="供应商" prop="supplierId">
|
|
|
- <el-select v-model="dataForm.supplierId" clearable placeholder="请选择" style="width: 200px;" :disabled="type === 'detail'">
|
|
|
- <el-option :key="item.id" v-for="item in supplierList" :label="item.businessName" :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
- <el-select v-model="dataForm.warehouseId" clearable placeholder="请选择" style="width: 200px;" :disabled="type === 'detail'">
|
|
|
- <el-option :key="item.id" v-for="item in warehouseList" :label="item.warehouseName" :value="item.id">
|
|
|
+ <el-select v-model="dataForm.warehouseId" clearable placeholder="请选择" style="width: 200px;"
|
|
|
+ :disabled="type === 'detail'">
|
|
|
+ <el-option :key="item.id" v-for="item in warehouseList" :label="item.warehouseName"
|
|
|
+ :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="经手人" prop="addHandlerId">
|
|
|
- <el-select v-model="dataForm.addHandlerId" clearable filterable placeholder="请选择" style="width: 200px" :disabled="type === 'detail'">
|
|
|
- <el-option :key="item.loginId" v-for="item in recipientsList" :label="item.deptName+'_'+item.userName" :value="item.loginId">
|
|
|
+ <el-form-item label="盘点人" prop="addHandlerId">
|
|
|
+ <el-select v-model="dataForm.addHandlerId" clearable filterable placeholder="请选择" style="width: 200px"
|
|
|
+ :disabled="type === 'detail'">
|
|
|
+ <el-option :key="item.loginId" v-for="item in userSelsctList"
|
|
|
+ :label="item.deptName + '_' + item.userName" :value="item.loginId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
-
|
|
|
- <!-- <el-form-item label="采购说明" prop="desc">
|
|
|
- <el-input style="width:535px" v-model="dataForm.desc" :maxlength="120"
|
|
|
- type="textarea" :disabled="type === 'detail'" :autosize="{ minRows: 1, maxRows: 4 }"
|
|
|
- placeholder="请输入采购说明 最大120字"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
- <el-form-item label="附件:" prop="fileIds">
|
|
|
- <el-upload :limit="1" :action="fileUrl" :file-list="dataForm.fileList" :on-success="handleFileSuccess"
|
|
|
- :before-upload="beforeUploadFile" :on-remove="handleRemove">
|
|
|
- <el-button size="small" type="primary" :disabled="type === 'detail'">点击上传</el-button>
|
|
|
- </el-upload>
|
|
|
- </el-form-item>
|
|
|
<div class="mx">
|
|
|
- <h3>入库明细</h3>
|
|
|
- <el-button size="small" type="primary" v-if="type !== 'detail'"
|
|
|
- @click="handleSelectGoods" icon="el-icon-plus">商品/物料</el-button>
|
|
|
- </div>
|
|
|
- <el-table size="small" :data="dataForm.inventoryEntryInfos" border :cell-style="{ textAlign: 'center' }"
|
|
|
- :header-cell-style="{ textAlign: 'center' }" style="width: 100%">
|
|
|
- <el-table-column label="商品编号">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.productCode }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="商品名称">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.productName }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="单价(￥)">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.createPrice.toFixed(2) }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="库存数量">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.createProductNumber }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="入库数量">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item v-if="type !== 'detail'" :prop="'inventoryEntryInfos.'+scope.$index+'.updateNumber'" :rules="{ required: true, message: '入库数量不能为空', trigger: 'blur' }" class="tableFormItem">
|
|
|
- <el-input-number v-model="scope.row.updateNumber" @change="handleChange(scope.row)" size="small" :min="1" :max="10000" label="入库数量"></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- <span v-else>{{ scope.row.updateNumber }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="合计(￥)">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.sumPrice.toFixed(2) }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- <el-table-column label="备注">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input :maxlength="99" v-model="scope.row.remark" :disabled="type === 'detail'" />
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
- <el-table-column label="操作" width="150" v-if="type !== 'detail'">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button size="mini" type="danger"
|
|
|
- @click="dataForm.inventoryEntryInfos.splice(scope.$index, 1)">删除</el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
+ <h3>盘点明细</h3>
|
|
|
+ <el-button size="small" type="primary" v-if="type !== 'detail'" @click="handleSelectGoods('inventoryEntryInfos')"
|
|
|
+ icon="el-icon-plus">商品/物料</el-button>
|
|
|
+ </div>
|
|
|
+ <el-table size="small" :data="dataForm.inventoryEntryInfos" border :cell-style="{ textAlign: 'center' }"
|
|
|
+ :header-cell-style="{ textAlign: 'center' }" style="width: 100%">
|
|
|
+ <el-table-column label="商品编号">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.productCode }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="商品名称">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.productName }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="单价(￥)">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.createPrice.toFixed(2) }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="库存数量">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.createProductNumber }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="盘点数量">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item v-if="type !== 'detail'"
|
|
|
+ :prop="'inventoryEntryInfos.' + scope.$index + '.updateNumber'"
|
|
|
+ :rules="{ required: true, message: '盘点数量不能为空', trigger: 'blur' }" class="tableFormItem">
|
|
|
+ <el-input-number v-model="scope.row.updateNumber" @change="handleChange(scope.row)"
|
|
|
+ size="small" :min="1" :max="10000"></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ <span v-else>{{ scope.row.updateNumber }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="差异">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.sumPrice }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="备注">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-if="type !== 'detail'" :maxlength="99" v-model="scope.row.remarks" />
|
|
|
+ <span v-else>{{ scope.row.remarks }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="150" v-if="type !== 'detail'">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button size="mini" type="danger"
|
|
|
+ @click="dataForm.inventoryEntryInfos.splice(scope.$index, 1)">删除</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
</el-form>
|
|
|
<div class="footer">
|
|
|
<el-button type="primary" @click="submitForm" v-if="type !== 'detail'">保存
|
|
|
@@ -114,31 +99,32 @@ export default {
|
|
|
directives: { waves },
|
|
|
data() {
|
|
|
return {
|
|
|
- fileUrl:this.upLoadUrl,
|
|
|
- recipientsList:[],
|
|
|
+ userSelsctList: [],
|
|
|
supplierList: [],
|
|
|
warehouseList: [],
|
|
|
id: '',
|
|
|
type: '',
|
|
|
/** 表单*/
|
|
|
dataForm: {
|
|
|
- serialDate:'',
|
|
|
- supplierId:undefined,
|
|
|
- warehouseId:undefined,
|
|
|
- addHandlerId:undefined,
|
|
|
- fileIds:undefined,
|
|
|
- fileList: [],
|
|
|
- inventoryEntryInfos: []
|
|
|
+ serialDate: '',
|
|
|
+ warehouseId: undefined,
|
|
|
+ addHandlerId: undefined,
|
|
|
+ remarks: undefined,
|
|
|
+ inventoryEntryInfos: [],
|
|
|
+ inventoryOutInfos: []
|
|
|
},
|
|
|
rules: {
|
|
|
serialDate: [
|
|
|
- { required: true, message: '请选择入库时间', trigger: 'blur' }
|
|
|
+ { required: true, message: '请选择盘点时间', trigger: 'blur' }
|
|
|
],
|
|
|
warehouseId: [
|
|
|
{ required: true, message: '请选择仓库', trigger: 'blur' }
|
|
|
],
|
|
|
+ remarks: [
|
|
|
+ { required: true, message: '请填写盘点原因', trigger: 'blur' }
|
|
|
+ ],
|
|
|
addHandlerId: [
|
|
|
- { required: true, message: '请选择经手人', trigger: 'blur' }
|
|
|
+ { required: true, message: '请选择盘点人', trigger: 'blur' }
|
|
|
],
|
|
|
},
|
|
|
}
|
|
|
@@ -149,13 +135,12 @@ export default {
|
|
|
handler(newVal) {
|
|
|
if (this.$route.name === 'stockCountAdd') {
|
|
|
this.dataForm = {
|
|
|
- serialDate:undefined,
|
|
|
- supplierId:undefined,
|
|
|
- warehouseId:undefined,
|
|
|
- addHandlerId:undefined,
|
|
|
- fileIds:undefined,
|
|
|
- fileList: [],
|
|
|
- inventoryEntryInfos: []
|
|
|
+ serialDate: '',
|
|
|
+ warehouseId: undefined,
|
|
|
+ addHandlerId: undefined,
|
|
|
+ remarks: undefined,
|
|
|
+ inventoryEntryInfos: [],
|
|
|
+ inventoryOutInfos: []
|
|
|
}
|
|
|
} else if (this.$route.name === 'stockCountDetail') {
|
|
|
this.type = 'detail'
|
|
|
@@ -169,12 +154,12 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.getSupplierList();
|
|
|
- this.getStoreList();
|
|
|
- this.getAllUserList();
|
|
|
+ this.getStoreList();
|
|
|
+ this.getAllUserList();
|
|
|
},
|
|
|
methods: {
|
|
|
/** 获取供应商列表数据 */
|
|
|
- getSupplierList(){
|
|
|
+ getSupplierList() {
|
|
|
supplierList().then(response => {
|
|
|
this.supplierList = response.data.data;
|
|
|
}).catch(() => { });
|
|
|
@@ -183,12 +168,12 @@ export default {
|
|
|
getStoreList() {
|
|
|
warehouseList().then(response => {
|
|
|
this.warehouseList = response.data.data;
|
|
|
- }).catch(() => {});
|
|
|
+ }).catch(() => { });
|
|
|
},
|
|
|
/** 获取人员列表数据 */
|
|
|
getAllUserList() {
|
|
|
allUserList().then(response => {
|
|
|
- this.recipientsList = response.data.data;
|
|
|
+ this.userSelsctList = response.data.data;
|
|
|
}).catch(() => { });
|
|
|
},
|
|
|
/** 获取详情页面数据 */
|
|
|
@@ -198,39 +183,47 @@ export default {
|
|
|
dataForm.inventoryEntryInfos = dataForm.inventoryEntryInfos == null ? [] : dataForm.inventoryEntryInfos
|
|
|
dataForm.inventoryOutInfos = dataForm.inventoryOutInfos == null ? [] : dataForm.inventoryOutInfos
|
|
|
this.dataForm = dataForm;
|
|
|
- }).catch(() => {})
|
|
|
+ }).catch(() => { })
|
|
|
},
|
|
|
- // 选择商品
|
|
|
- async handleSelectGoods() {
|
|
|
+ // 选择商品
|
|
|
+ async handleSelectGoods(val) {
|
|
|
if (!this.dataForm.warehouseId) {
|
|
|
this.$message.error('请先选择仓库！')
|
|
|
return
|
|
|
- }else{
|
|
|
- console.log(this.dataForm.inventoryEntryInfos)
|
|
|
- let selectedIds = this.dataForm.inventoryEntryInfos.map(item => item.id);
|
|
|
+ } else {
|
|
|
+ let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.productId) : this.dataForm.inventoryOutInfos.map(item => item.productId);
|
|
|
const Goods = await this.$EnPickerGoods({
|
|
|
// goodsApi: '/warehouse-entry/info/inventory',
|
|
|
selectedIds: selectedIds,
|
|
|
goodsApiParams: { warehouseId: this.dataForm.warehouseId }
|
|
|
})
|
|
|
if (!Goods.length) return
|
|
|
- const inventoryEntryInfos = Goods.map(item => {
|
|
|
- item.updateNumber = 1
|
|
|
- item.sumPrice = item.createPrice * 1
|
|
|
- return item
|
|
|
- })
|
|
|
- this.dataForm.inventoryEntryInfos = this.dataForm.inventoryEntryInfos && this.dataForm.inventoryEntryInfos.length ? this.dataForm.inventoryEntryInfos.concat(inventoryEntryInfos) : this.dataForm.inventoryEntryInfos = inventoryEntryInfos
|
|
|
+ if(val=='inventoryEntryInfos'){
|
|
|
+ const inventoryEntryInfos = Goods.map(item => {
|
|
|
+ item.updateNumber = 1
|
|
|
+ item.sumPrice = item.createProductNumber - 1
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ this.dataForm.inventoryEntryInfos = this.dataForm.inventoryEntryInfos && this.dataForm.inventoryEntryInfos.length ? this.dataForm.inventoryEntryInfos.concat(inventoryEntryInfos) : this.dataForm.inventoryEntryInfos = inventoryEntryInfos
|
|
|
+ }else{
|
|
|
+ const inventoryOutInfos = Goods.map(item => {
|
|
|
+ item.updateNumber = 1
|
|
|
+ item.sumPrice = item.createProductNumber - 1
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ this.dataForm.inventoryOutInfos = this.dataForm.inventoryOutInfos && this.dataForm.inventoryOutInfos.length ? this.dataForm.inventoryOutInfos.concat(inventoryOutInfos) : this.dataForm.inventoryOutInfos = inventoryOutInfos
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
- submitForm(){
|
|
|
+ submitForm() {
|
|
|
this.$refs["dataForm"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if(this.dataForm.inventoryEntryInfos.length == 0){
|
|
|
+ if (this.dataForm.inventoryEntryInfos.length == 0 || this.dataForm.inventoryOutInfos.length == 0) {
|
|
|
this.$message.error('请选择商品/物料！')
|
|
|
return
|
|
|
- }else{
|
|
|
- if(this.id){
|
|
|
+ } else {
|
|
|
+ if (this.id) {
|
|
|
updateStockCount(this.dataForm).then(() => {
|
|
|
this.$notify({
|
|
|
title: '成功',
|
|
|
@@ -240,7 +233,7 @@ export default {
|
|
|
})
|
|
|
this.roBack();
|
|
|
})
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
createStockCount(this.dataForm).then(() => {
|
|
|
this.$notify({
|
|
|
title: "成功",
|
|
|
@@ -251,14 +244,12 @@ export default {
|
|
|
this.roBack();
|
|
|
})
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
handleChange(row) {
|
|
|
- if (row.createPrice && row.updateNumber) {
|
|
|
- row.sumPrice = row.createPrice * row.updateNumber
|
|
|
- }
|
|
|
+ row.sumPrice = row.createProductNumber - row.updateNumber
|
|
|
},
|
|
|
roBack() {
|
|
|
// const { callback } = this.$route.params
|
|
|
@@ -272,64 +263,29 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
// this.$router.push({ name: 'stockCount' })
|
|
|
- },
|
|
|
- handleRemove(file, fileList) {
|
|
|
- console.log(file, fileList);
|
|
|
- let fileIds = [];
|
|
|
- for (let i in fileList) {
|
|
|
- let id = fileList[i].response.data.id;
|
|
|
- fileIds.push(id);
|
|
|
- }
|
|
|
- this.dataForm.fileIds = fileIds.join(",");
|
|
|
- },
|
|
|
- beforeUploadFile(file) {
|
|
|
- console.log(file);
|
|
|
- const size = file.size / 1024 / 1024;
|
|
|
- console.log(size);
|
|
|
- if (size > 10) {
|
|
|
- this.$message.error("文件大小不能超过10MB！");
|
|
|
- return false;
|
|
|
- }
|
|
|
- },
|
|
|
- handleFileSuccess(res, file, fileList) {
|
|
|
- console.log(file, fileList);
|
|
|
- console.log("------", "==========");
|
|
|
- console.log("res = ", res);
|
|
|
-
|
|
|
- let fileIds = [];
|
|
|
- for (let i in fileList) {
|
|
|
- let response = fileList[i].response;
|
|
|
- if (response.errno && response.errno != "0") {
|
|
|
- this.$message.error("该文件上传失败,已被移除,请重新上传!");
|
|
|
- // 上传失败移除该 file 对象
|
|
|
- fileList.splice(i, 1);
|
|
|
- } else {
|
|
|
- let id = fileList[i].response.data.id;
|
|
|
- fileIds.push(id);
|
|
|
- }
|
|
|
}
|
|
|
- this.dataForm.fileIds = fileIds.join(",");
|
|
|
- },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
<style>
|
|
|
/** 底部步骤 */
|
|
|
.footer {
|
|
|
- width: 100%;
|
|
|
- padding: 10px;
|
|
|
- bottom: 0px;
|
|
|
- text-align: center;
|
|
|
- z-index: 999;
|
|
|
+ width: 100%;
|
|
|
+ padding: 10px;
|
|
|
+ bottom: 0px;
|
|
|
+ text-align: center;
|
|
|
+ z-index: 999;
|
|
|
}
|
|
|
+
|
|
|
.mx {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
}
|
|
|
+
|
|
|
/** 表格中输入框样式 */
|
|
|
.tableFormItem {
|
|
|
- width: 100%;
|
|
|
- margin-bottom: 0;
|
|
|
+ width: 100%;
|
|
|
+ margin-bottom: 0;
|
|
|
}
|
|
|
</style>
|
