From 94de1745b4b69eeeb1ac8c5d3508ce87258afc25 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期四, 16 十一月 2023 09:22:06 +0800
Subject: [PATCH] 库存管理
---
admin-web/src/views/stock/transfer/transferApplication/edit.vue | 296 ++++++++++++++++++++++-------------------------------------
1 files changed, 111 insertions(+), 185 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index dcb0408..a990b13 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -1,19 +1,19 @@
<template>
- <win-md class="stock-edit" :title="`${setting.title}璋冩嫧璋冩嫧`" @close="close" :width="'800px'">
+ <win-md class="stock-edit" title="璋冩嫧鐢宠" @close="close" :width="'800px'">
<el-form class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
<div class="main-w">
<el-row :gutter="24" class="headerHeight">
<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-form-item label="璋冩嫧鏈烘瀯" prop="outAgencyId">
+ <el-select v-model="formData.outAgencyId" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in agencyOptions" :key="item.id" :label="item.name" :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="createTime">
<el-date-picker
- v-model="formData.procureTime"
+ v-model="formData.createTime"
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>
</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.transferGoods" :key="goodsIndex">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item
label="鐗╁搧鍒嗙被"
- :prop="`procureGoods[${goodsIndex}].baseCategoryIds`"
+ :prop="`transferGoods[${goodsIndex}].baseCategoryIds`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -55,7 +55,7 @@
<el-col :span="12">
<el-form-item
label="鐗╁搧鍚嶇О"
- :prop="`procureGoods[${goodsIndex}].baseGoodsTemplateId`"
+ :prop="`transferGoods[${goodsIndex}].baseGoodsTemplateId`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -63,7 +63,7 @@
}"
>
<el-select
- v-model="goodsItem.baseGoodsTemplateId"
+ :value="goodsItem.baseGoodsTemplateId"
placeholder="璇峰厛鎷╃墿鍝佸垎绫�"
filterable
:disabled="!goodsItem.baseCategoryId"
@@ -84,7 +84,7 @@
<el-col :span="12">
<el-form-item
label="瑙勬牸鍨嬪彿"
- :prop="`procureGoods[${goodsIndex}].modelsIds`"
+ :prop="`transferGoods[${goodsIndex}].modelsIds`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -121,24 +121,31 @@
{{ scope.row.unit }}
</template>
</el-table-column>
- <el-table-column prop="price" label="鐜版湁搴撳瓨" align="center">
- <template slot-scope="scope">{{ }}
+ <el-table-column prop="price" label="鍓╀綑搴撳瓨" align="center">
+ <template slot-scope="scope">
{{ scope.row.worehouseCount }}
</template>
</el-table-column>
- <el-table-column prop="counts" label="璋冩嫧鏁伴噺" align="center">
+ <el-table-column prop="counts" label="鐢宠鏁伴噺" align="center">
<template slot-scope="scope">
- <el-input
- type="number"
- v-model="scope.row.counts"
- @change="countsChange($event, goodsIndex,scope.$index)"
- ></el-input>
+ <el-form-item
+ label-width="0"
+ style="margin-bottom: 0"
+ :prop="`transferGoods[${goodsIndex}].models[${scope.$index}].counts`"
+ :rules="rules.counts"
+ >
+ <el-input
+ v-model.number="scope.row.counts"
+ placeholder="璇疯緭鍏�"
+ @change="countsChange($event, goodsIndex, scope.$index)"
+ ></el-input>
+ </el-form-item>
</template>
</el-table-column>
</el-table>
<div class="btn-group">
<el-button
- v-if="formData.procureGoods.length > 1"
+ v-if="formData.transferGoods.length > 1"
name="绉婚櫎"
type="danger"
plain
@@ -147,7 +154,7 @@
>绉婚櫎</el-button
>
<el-button
- v-if="formData.procureGoods.length - 1 == goodsIndex"
+ v-if="formData.transferGoods.length - 1 == goodsIndex"
name="鏂板鐗╁搧"
type="primary"
plain
@@ -166,21 +173,14 @@
</win-md>
</template>
<script>
-import {
- goodsTemplate,
- procureAdd,
- procureEdit,
- selectTenantWarehouse,
- goodsModel,
- procureDetail,
-} from '@/api/stock/procure/purchaseOrder';
-import { getTree } from '@/api/foudation/classification';
+import { transferAdd } from '@/api/stock/transfer';
+import { getCategorySelectTree, getTree, goodsTemplate, goodsModel } from '@/api/baseSetting/finsystenant';
+import { getParentTenant,queryWarehouseGoods } from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
import upload from '@/components/upload/index';
import { getUploadUrl } from '@/utils/base';
-
-import SettingIplatform from '../../../../../public/static/config';
+import { mapGetters } from 'vuex';
export default {
components: { MyButton, winMd, upload },
@@ -192,35 +192,21 @@
},
data() {
return {
- visible: false,
loading: false,
- buyTypeOptions: [
- {
- label: '闆嗛噰',
- value: '1',
- },
- {
- label: '鑷噰',
- value: '2',
- },
- ],
- warehouses: [], // 璋冩嫧浠撳簱鍒楄〃
+ agencyOptions: [], // 璋冩嫧鏈烘瀯
categoryOptions: [], // 鐗╁搧鍒嗙被鍒楄〃
modelList: [], //鍨嬪彿鍒楄〃
formData: {
- warehouseId: '', // 璋冩嫧浠撳簱id
- procureTime: '', // 璋冩嫧鏃堕棿
- buyType: '2', // 璋冩嫧鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
- procureGoods: [],
+ transferBusinessType: 0, // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ outAgencyId: '', // 璋冩嫧鏈烘瀯id
+ createTime: '', // 璋冩嫧鏃堕棿
+ transferGoods: [],
},
goodsItem: {
- whFormProcureId: '', // 璋冩嫧鍗旾D
baseCategoryIds: '', // 鍒嗙被缂栧彿鏁扮粍
baseCategoryId: '', // 鍒嗙被缂栧彿
baseGoodsTemplateId: '', // 鐗╁搧妯＄増缂栧彿
goodsTemplateName: '', // 鐗╁搧妯＄増鍚嶇О
- supplier: '', // 渚涘簲鍟�
- sort: '', // 鏄剧ず椤哄簭
goodsOptions: [], // 鐗╁搧鍒楄〃select
modelsOptions: [], //瑙勬牸鍨嬪彿select
models: [], // 鐗╁搧鍚嶇О
@@ -228,21 +214,21 @@
},
modelsItem: {
baseGoodsModelsId: '', // 瑙勬牸鍨嬪彿缂栧彿
- price: 0, // 鍗曚环(璋冩嫧闇�瑕侊紝璋冩嫧涓嶉渶瑕�)
- worehouseCount: 0,
- counts: 0, // 鎿嶄綔鏁伴噺
- supplier: '', // 渚涘簲鍟�
+ worehouseCount: 10,
+ counts: null, // 鎿嶄綔鏁伴噺
unit: null, //鍗曚綅
},
rules: {
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- procureTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+ createTime: [{ 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' }],
+ counts: [
+ { required: true, message: '璇疯緭鍏�', trigger: 'change' },
+ { type: 'number', message: '鏁伴噺蹇呴』涓烘暣鏁�' },
+ ],
},
uploadSettings: {
@@ -258,55 +244,33 @@
},
};
},
+ computed: {
+ ...mapGetters(['userInfo']),
+ },
created() {
this.init();
},
methods: {
async init() {
- this.getWarehouseList();
+ this.handegetParentTenant();
this.getgoodsTemplate();
this.getgoodsModel();
- // 鑾峰彇鐗╁搧鍒嗙被鍒楄〃
- 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.getCategoryTree();
+ this.formData.transferGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
},
- // 鑾峰彇璋冩嫧浠撳簱鍒楄〃
- getWarehouseList() {
- selectTenantWarehouse()
- .then((res) => {
- this.warehouses = res;
- if (this.warehouses.length && !this.formData.warehouseId) {
- // 榛樿閫変腑绗竴涓粨搴�
- this.formData.warehouseId = this.warehouses[0].id;
- }
- })
- .catch((err) => {
- console.log('err', err);
- });
+ // 鑾峰彇涓婄骇鏈烘瀯
+ handegetParentTenant() {
+ getParentTenant().then((res) => {
+ this.agencyOptions = [res];
+ this.formData.outAgencyId = res.id;
+ });
+ },
+
+ async getCategoryTree() {
+ // 鑾峰彇鐗╁搧鍒嗙被鍒楄〃
+ const treeRes = await getCategorySelectTree();
+ this.categoryOptions = this.removeEmptyChildren(treeRes);
},
removeEmptyChildren(arr) {
@@ -322,9 +286,9 @@
// 鑾峰彇鐗╁搧鍚嶇О鍒楄〃
getgoodsTemplate(id, index) {
- goodsTemplate({ categoryId: id || '' }).then((res) => {
+ queryWarehouseGoods({ categoryId: id || '', agencyId: this.formData.outAgencyId }).then((res) => {
if (index || index == 0) {
- this.$set(this.formData.procureGoods[index], 'goodsOptions', res);
+ this.$set(this.formData.transferGoods[index], 'goodsOptions', res);
} else {
this.goodsTemplatelAll = res;
}
@@ -335,7 +299,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.transferGoods[index], 'modelsOptions', res);
} else {
this.goodsModelAll = res;
}
@@ -362,32 +326,39 @@
// 鐗╁搧鍒嗙被閫夋嫨
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.transferGoods[index].goodsOptions = [];
+ this.formData.transferGoods[index].baseGoodsTemplateId = '';
+ this.formData.transferGoods[index].goodsTemplateName = '';
+ this.formData.transferGoods[index].modelsOptions = [];
+ this.formData.transferGoods[index].modelsIds = [];
+ this.formData.transferGoods[index].models = [];
- this.formData.procureGoods[index].baseCategoryId = e[e.length - 1];
+ this.formData.transferGoods[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 = [];
+ let temp = this.formData.transferGoods.find(v=>v.baseGoodsTemplateId==e)
+ if(temp) {
+ this.$message.warning('宸查�夎繃姝ょ墿鍝�')
+ return
+ }else{
+ this.formData.transferGoods[index].baseGoodsTemplateId = e
+ }
+ this.formData.transferGoods[index].modelsOptions = [];
+ this.formData.transferGoods[index].modelsIds = [];
+ this.formData.transferGoods[index].models = [];
- this.formData.procureGoods[index].goodsTemplateName = this.getGoodsTemplateName(e);
+ this.formData.transferGoods[index].goodsTemplateName = this.getGoodsTemplateName(e);
// 鏍规嵁閫変腑鐗╁搧鍚嶇Оid鑾峰彇瑙勬牸鍨嬪彿鍒楄〃
this.getgoodsModel(e, index);
},
// 瑙勬牸鍨嬪彿閫夋嫨
modelChange(e, index) {
- let arr = [...this.formData.procureGoods[index].models];
+ let arr = [...this.formData.transferGoods[index].models];
let str = JSON.stringify(arr);
e.forEach((item) => {
if (str.indexOf(item) == -1) {
@@ -395,14 +366,14 @@
arr.push({ ...this.modelsItem, baseGoodsModelsId: item, unit: temp.unit });
}
});
- this.formData.procureGoods[index].models = arr;
+ this.formData.transferGoods[index].models = arr;
},
// 瑙勬牸鍨嬪彿绉婚櫎
modelRemoveTag(e, index) {
- let arr = this.formData.procureGoods[index].models;
+ let arr = this.formData.transferGoods[index].models;
let delIndex = arr.findIndex((v) => v.baseGoodsModelsId == e);
- this.formData.procureGoods[index].models.splice(delIndex, 1);
+ this.formData.transferGoods[index].models.splice(delIndex, 1);
},
// 涓婁紶
@@ -412,21 +383,25 @@
// 鐐瑰嚮鏂板鐗╁搧
addGoods() {
- this.formData.procureGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
+ this.formData.transferGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
},
// 鐐瑰嚮绉婚櫎
removeGoods(index) {
- this.formData.procureGoods.splice(index, 1);
+ this.formData.transferGoods.splice(index, 1);
},
// 璋冩嫧鏁伴噺鏍￠獙
- countsChange(e, goodsIndex,index) {
- const curItem = this.formData.procureGoods[goodsIndex].models[index]
- const worehouseCount = curItem.worehouseCount
+ countsChange(e, goodsIndex, index) {
+ const curItem = this.formData.transferGoods[goodsIndex].models[index];
+ const worehouseCount = curItem.worehouseCount;
+ if(e==0) {
+ this.$message.warning('鏁伴噺涓嶈兘涓�0');
+ curItem.counts = null
+ }
if (e > worehouseCount) {
- this.$message.warning('鏁伴瓒呰繃鐜版湁搴撳瓨');
- curItem.counts = worehouseCount
+ this.$message.warning('鏁伴噺瓒呰繃鐜版湁搴撳瓨');
+ curItem.counts = worehouseCount;
}
},
@@ -435,29 +410,16 @@
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)
- .then((res) => {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- })
- .catch((err) => {
- console.log('edit err', err);
- this.$message.error('淇濆瓨澶辫触');
- });
- }
+ transferAdd(this.formData)
+ .then((res) => {
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
+ })
+ .catch((err) => {
+ console.log('edit err', err);
+ this.$message.error('淇濆瓨澶辫触');
+ });
} else {
this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��');
}
@@ -468,45 +430,9 @@
this.formData = {
warehouseId: '', // 璋冩嫧浠撳簱id
procureTime: '', // 璋冩嫧鏃堕棿
- procureGoods: [],
+ transferGoods: [],
};
this.$emit('close');
- },
-
- // 閫氳繃瀛愰泦id鏌ュ埌鎵�浠ョ浉鍏崇埗绾d骞惰繑鍥炴暟缁�
- findParentIds(dataSource, nodeId) {
- const parentIds = []; // 鐢ㄤ簬瀛樺偍鎵�鏈夌埗鑺傜偣ID鐨勬暟缁�
-
- // 瀹氫箟涓�涓�掑綊鍑芥暟锛岀敤浜庨亶鍘嗘暣妫垫爲骞舵煡鎵惧瓙鑺傜偣鐨勬墍鏈夌埗鑺傜偣
- function traverse(node, nodeId) {
- if (node.id === nodeId) {
- // 濡傛灉褰撳墠鑺傜偣鐨処D绛変簬瀛愯妭鐐圭殑ID锛屽垯琛ㄧず宸茬粡鎵惧埌浜嗗瓙鑺傜偣锛屽彲浠ュ紑濮嬪悜涓婃煡鎵剧埗鑺傜偣
- return true; // 杩斿洖true琛ㄧず宸茬粡鎵惧埌浜嗗瓙鑺傜偣
- }
-
- if (node.children) {
- // 濡傛灉褰撳墠鑺傜偣鏈夊瓙鑺傜偣锛屽垯缁х画閬嶅巻瀛愯妭鐐�
- for (const childNode of node.children) {
- if (traverse(childNode, nodeId)) {
- // 濡傛灉鍦ㄥ瓙鑺傜偣涓壘鍒颁簡瀛愯妭鐐圭殑鐖惰妭鐐癸紝鍒欏皢褰撳墠鑺傜偣鐨処D娣诲姞鍒扮埗鑺傜偣ID鏁扮粍涓紝骞惰繑鍥瀟rue琛ㄧず宸茬粡鎵惧埌浜嗗瓙鑺傜偣
- parentIds.push(node.id);
- return true;
- }
- }
- }
-
- return false; // 濡傛灉褰撳墠鑺傜偣涓嶆槸瀛愯妭鐐圭殑鐖惰妭鐐癸紝鍒欒繑鍥瀎alse
- }
-
- // 浠庢牴鑺傜偣寮�濮嬮亶鍘嗘暣妫垫爲锛屽苟璋冪敤閫掑綊鍑芥暟鏌ユ壘瀛愯妭鐐圭殑鎵�鏈夌埗鑺傜偣
- for (const node of dataSource) {
- if (traverse(node, nodeId)) {
- // 濡傛灉鍦ㄥ綋鍓嶈妭鐐圭殑瀛愭爲涓壘鍒颁簡瀛愯妭鐐圭殑鐖惰妭鐐癸紝鍒欑洿鎺ラ��鍑哄惊鐜�
- break;
- }
- }
-
- return parentIds; // 杩斿洖鎵�鏈夌埗鑺傜偣ID鐨勬暟缁�
},
},
};
--
Gitblit v1.9.1