From 6843b10472482b305b5580cc2f5cdbb97fb9a203 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 13 十一月 2023 17:31:43 +0800
Subject: [PATCH] 调拨，库存盘点，报废管理，台账管理
---
admin-web/src/views/stock/accessStock/outbound/edit.vue | 169 ++++++++++++++++++++------------------------------------
1 files changed, 61 insertions(+), 108 deletions(-)
diff --git a/admin-web/src/views/stock/accessStock/outbound/edit.vue b/admin-web/src/views/stock/accessStock/outbound/edit.vue
index 22d1448..fce80a0 100644
--- a/admin-web/src/views/stock/accessStock/outbound/edit.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -6,14 +6,14 @@
<el-col :span="12">
<el-form-item label="鍑哄簱浠撳簱" prop="warehouseId">
<el-select v-model="formData.warehouseId" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in warehouses" :key="item.id" :label="item.warehouseName" :value="item.id" />
+ <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍑哄簱鏃堕棿" prop="procureTime">
+ <el-form-item label="鍑哄簱鏃堕棿" prop="dealTime">
<el-date-picker
- v-model="formData.procureTime"
+ v-model="formData.dealTime"
type="datetime"
value="yyyy-MM-dd HH:mm:ss"
value-format="yyyyMMddHHmmss"
@@ -25,18 +25,18 @@
</el-col>
</el-row>
<el-row :gutter="24" class="headerHeight">
- <el-col :span="12">
+ <el-col :span="24">
<el-form-item label="鍑哄簱鎵嬬画" prop="procureDoc">
- <upload :settings="uploadSettings" @on-change="uploadChange"></upload>
+ <upload ref="uploadRef" :settings="uploadSettings" @on-change="uploadChange"></upload>
</el-form-item>
</el-col>
</el-row>
- <div class="goods-card" v-for="(goodsItem, goodsIndex) in formData.procureGoods" :key="goodsIndex">
+ <div class="goods-card" v-for="(goodsItem, goodsIndex) in formData.goods" :key="goodsIndex">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item
label="鐗╁搧鍒嗙被"
- :prop="`procureGoods[${goodsIndex}].baseCategoryIds`"
+ :prop="`goods[${goodsIndex}].baseCategoryIds`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -55,7 +55,7 @@
<el-col :span="12">
<el-form-item
label="鐗╁搧鍚嶇О"
- :prop="`procureGoods[${goodsIndex}].baseGoodsTemplateId`"
+ :prop="`goods[${goodsIndex}].baseGoodsTemplateId`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -84,7 +84,7 @@
<el-col :span="12">
<el-form-item
label="瑙勬牸鍨嬪彿"
- :prop="`procureGoods[${goodsIndex}].modelsIds`"
+ :prop="`goods[${goodsIndex}].modelsIds`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -138,7 +138,7 @@
</el-table>
<div class="btn-group">
<el-button
- v-if="formData.procureGoods.length > 1"
+ v-if="formData.goods.length > 1"
name="绉婚櫎"
type="danger"
plain
@@ -147,7 +147,7 @@
>绉婚櫎</el-button
>
<el-button
- v-if="formData.procureGoods.length - 1 == goodsIndex"
+ v-if="formData.goods.length - 1 == goodsIndex"
name="鏂板鐗╁搧"
type="primary"
plain
@@ -168,12 +168,13 @@
<script>
import {
goodsTemplate,
- procureAdd,
- procureEdit,
- selectTenantWarehouse,
goodsModel,
- procureDetail,
-} from '@/api/stock/procure/purchaseOrder';
+ selectTenantWarehouse,
+} from '@/api/baseSetting/finsystenant';
+import {
+ outputAdd,
+ outputSelectNumber
+} from '@/api/stock/accessStock';
import { getTree } from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
@@ -192,35 +193,21 @@
},
data() {
return {
- visible: false,
loading: false,
- buyTypeOptions: [
- {
- label: '闆嗛噰',
- value: '1',
- },
- {
- label: '鑷噰',
- value: '2',
- },
- ],
- warehouses: [], // 鍑哄簱浠撳簱鍒楄〃
+ warehouseOptions: [], // 鍑哄簱浠撳簱鍒楄〃
categoryOptions: [], // 鐗╁搧鍒嗙被鍒楄〃
modelList: [], //鍨嬪彿鍒楄〃
formData: {
warehouseId: '', // 鍑哄簱浠撳簱id
- procureTime: '', // 鍑哄簱鏃堕棿
- buyType: '2', // 鍑哄簱鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
- procureGoods: [],
+ dealTime: '', // 鍑哄簱鏃堕棿
+ procureDoc: '',
+ goods: [],
},
goodsItem: {
- whFormProcureId: '', // 鍑哄簱鍗旾D
baseCategoryIds: '', // 鍒嗙被缂栧彿鏁扮粍
baseCategoryId: '', // 鍒嗙被缂栧彿
baseGoodsTemplateId: '', // 鐗╁搧妯＄増缂栧彿
goodsTemplateName: '', // 鐗╁搧妯＄増鍚嶇О
- supplier: '', // 渚涘簲鍟�
- sort: '', // 鏄剧ず椤哄簭
goodsOptions: [], // 鐗╁搧鍒楄〃select
modelsOptions: [], //瑙勬牸鍨嬪彿select
models: [], // 鐗╁搧鍚嶇О
@@ -228,18 +215,16 @@
},
modelsItem: {
baseGoodsModelsId: '', // 瑙勬牸鍨嬪彿缂栧彿
- price: 0, // 鍗曚环(鍑哄簱闇�瑕侊紝璋冩嫧涓嶉渶瑕�)
worehouseCount: 0,
counts: 0, // 鎿嶄綔鏁伴噺
- supplier: '', // 渚涘簲鍟�
unit: null, //鍗曚綅
},
rules: {
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- procureTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+ dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- // procureDoc: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
+ procureDoc: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
baseGoodsTemplateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
@@ -248,13 +233,13 @@
uploadSettings: {
title: '涓婁紶',
max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
- num: 2, // 鏀寔涓婁紶鍥剧墖涓暟
+ num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
accept: '.jpg,.png', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'text', // text/picture
+ type: 'picture', // text/picture
},
};
},
@@ -269,39 +254,17 @@
// 鑾峰彇鐗╁搧鍒嗙被鍒楄〃
const treeRes = await getTree();
this.categoryOptions = this.removeEmptyChildren(treeRes);
- if (this.setting.id) {
- const detail = await procureDetail({ id: this.setting.id });
- this.formData = Object.assign(this.formData, detail);
- this.$set(this.formData, 'buyType', this.formData.buyType.toString());
- this.formData.procureTime = this.formData.procureTime.toString();
- this.formData.procureGoods.map((item, index) => {
- // 鏍规嵁瀛愰泦ID鎷兼帴鐗╁搧鍒嗙被鍒楄〃
- let pIds = this.findParentIds(this.categoryOptions, item.baseCategoryId);
- pIds = pIds.reverse();
- item.baseCategoryIds = [...pIds, item.baseCategoryId];
- this.$set(
- this.formData.procureGoods[index],
- 'modelsIds',
- item.models.map((v) => v.baseGoodsModelsId),
- );
- this.getgoodsTemplate(item.baseCategoryId, index);
- this.getgoodsModel(item.baseGoodsTemplateId, index);
- return item;
- });
- } else {
- this.formData.procureGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
- }
- this.visible = true;
+ this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
},
// 鑾峰彇鍑哄簱浠撳簱鍒楄〃
getWarehouseList() {
selectTenantWarehouse()
.then((res) => {
- this.warehouses = res;
- if (this.warehouses.length && !this.formData.warehouseId) {
+ this.warehouseOptions = res;
+ if (this.warehouseOptions.length && !this.formData.warehouseId) {
// 榛樿閫変腑绗竴涓粨搴�
- this.formData.warehouseId = this.warehouses[0].id;
+ this.formData.warehouseId = this.warehouseOptions[0].id;
}
})
.catch((err) => {
@@ -324,7 +287,7 @@
getgoodsTemplate(id, index) {
goodsTemplate({ categoryId: id || '' }).then((res) => {
if (index || index == 0) {
- this.$set(this.formData.procureGoods[index], 'goodsOptions', res);
+ this.$set(this.formData.goods[index], 'goodsOptions', res);
} else {
this.goodsTemplatelAll = res;
}
@@ -335,7 +298,7 @@
getgoodsModel(id, index) {
goodsModel({ goodsTemplatesId: id || '' }).then((res) => {
if (index || index == 0) {
- this.$set(this.formData.procureGoods[index], 'modelsOptions', res);
+ this.$set(this.formData.goods[index], 'modelsOptions', res);
} else {
this.goodsModelAll = res;
}
@@ -362,67 +325,70 @@
// 鐗╁搧鍒嗙被閫夋嫨
categoryChange(e, index) {
- this.formData.procureGoods[index].goodsOptions = [];
- this.formData.procureGoods[index].baseGoodsTemplateId = '';
- this.formData.procureGoods[index].goodsTemplateName = '';
- this.formData.procureGoods[index].modelsOptions = [];
- this.formData.procureGoods[index].modelsIds = [];
- this.formData.procureGoods[index].models = [];
+ this.formData.goods[index].goodsOptions = [];
+ this.formData.goods[index].baseGoodsTemplateId = '';
+ this.formData.goods[index].goodsTemplateName = '';
+ this.formData.goods[index].modelsOptions = [];
+ this.formData.goods[index].modelsIds = [];
+ this.formData.goods[index].models = [];
- this.formData.procureGoods[index].baseCategoryId = e[e.length - 1];
+ this.formData.goods[index].baseCategoryId = e[e.length - 1];
// 鏍规嵁閫変腑鍒嗙被璇锋眰鐗╁搧鍚嶇О鍒楄〃
this.getgoodsTemplate(e[e.length - 1], index);
},
// 鐗╁搧鍚嶇О鍒楄〃
goodsTemplateChange(e, index) {
- this.formData.procureGoods[index].modelsOptions = [];
- this.formData.procureGoods[index].modelsIds = [];
- this.formData.procureGoods[index].models = [];
+ this.formData.goods[index].modelsOptions = [];
+ this.formData.goods[index].modelsIds = [];
+ this.formData.goods[index].models = [];
- this.formData.procureGoods[index].goodsTemplateName = this.getGoodsTemplateName(e);
+ this.formData.goods[index].goodsTemplateName = this.getGoodsTemplateName(e);
// 鏍规嵁閫変腑鐗╁搧鍚嶇Оid鑾峰彇瑙勬牸鍨嬪彿鍒楄〃
this.getgoodsModel(e, index);
},
// 瑙勬牸鍨嬪彿閫夋嫨
- modelChange(e, index) {
- let arr = [...this.formData.procureGoods[index].models];
+ async modelChange(e, index) {
+ let arr = [...this.formData.goods[index].models];
let str = JSON.stringify(arr);
- e.forEach((item) => {
+ for(let item of e) {
if (str.indexOf(item) == -1) {
let temp = this.goodsModelAll.find((v) => v.id == item);
- arr.push({ ...this.modelsItem, baseGoodsModelsId: item, unit: temp.unit });
+ // 鑾峰彇搴撳瓨
+ let num = await outputSelectNumber({warehouseId:this.formData.warehouseId,baseGoodsModelsId:item})
+ arr.push({ ...this.modelsItem, baseGoodsModelsId: item, unit: temp.unit,worehouseCount: num});
}
- });
- this.formData.procureGoods[index].models = arr;
+ }
+ this.formData.goods[index].models = arr;
},
// 瑙勬牸鍨嬪彿绉婚櫎
modelRemoveTag(e, index) {
- let arr = this.formData.procureGoods[index].models;
+ let arr = this.formData.goods[index].models;
let delIndex = arr.findIndex((v) => v.baseGoodsModelsId == e);
- this.formData.procureGoods[index].models.splice(delIndex, 1);
+ this.formData.goods[index].models.splice(delIndex, 1);
},
// 涓婁紶
- uploadChange(e) {
- console.log('uploadChange', e);
+ uploadChange() {
+ let arr = this.$refs.uploadRef.fileList
+ this.formData.procureDoc = JSON.stringify(arr)
},
// 鐐瑰嚮鏂板鐗╁搧
addGoods() {
- this.formData.procureGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
+ this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
},
// 鐐瑰嚮绉婚櫎
removeGoods(index) {
- this.formData.procureGoods.splice(index, 1);
+ this.formData.goods.splice(index, 1);
},
// 鍑哄簱鏁伴噺鏍￠獙
countsChange(e, goodsIndex,index) {
- const curItem = this.formData.procureGoods[goodsIndex].models[index]
+ const curItem = this.formData.goods[goodsIndex].models[index]
const worehouseCount = curItem.worehouseCount
if (e > worehouseCount) {
this.$message.warning('鏁伴瓒呰繃鐜版湁搴撳瓨');
@@ -435,19 +401,7 @@
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
console.log('this.formData', this.formData);
- if (this.setting.id) {
- procureAdd(this.formData)
- .then((res) => {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- })
- .catch((err) => {
- console.log('create err', err);
- this.$message.error('淇濆瓨澶辫触');
- });
- } else {
- procureEdit(this.formData)
+ outputAdd(this.formData)
.then((res) => {
this.$message.success('淇濆瓨鎴愬姛锛�');
this.close();
@@ -457,7 +411,6 @@
console.log('edit err', err);
this.$message.error('淇濆瓨澶辫触');
});
- }
} else {
this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��');
}
@@ -467,8 +420,8 @@
close() {
this.formData = {
warehouseId: '', // 鍑哄簱浠撳簱id
- procureTime: '', // 鍑哄簱鏃堕棿
- procureGoods: [],
+ dealTime: '', // 鍑哄簱鏃堕棿
+ goods: [],
};
this.$emit('close');
},
--
Gitblit v1.9.1