From 9cf4b513cfc65d641d46be6ea424a9f45e4d48f7 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:43:24 +0800
Subject: [PATCH] feat: bug修复 12564
---
admin-web/src/views/stock/accessStock/outbound/edit.vue | 252 ++++++++++++++++++++++++++------------------------
1 files changed, 131 insertions(+), 121 deletions(-)
diff --git a/admin-web/src/views/stock/accessStock/outbound/edit.vue b/admin-web/src/views/stock/accessStock/outbound/edit.vue
index fce80a0..f6477e9 100644
--- a/admin-web/src/views/stock/accessStock/outbound/edit.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -1,12 +1,17 @@
<template>
- <win-md class="stock-edit" :title="`${setting.title}鍑哄簱鍑哄簱`" @close="close" :width="'800px'">
- <el-form class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
+ <win-md class="stock-edit" :title="`${setting.title}鍑哄簱`" @close="close" :width="'800px'">
+ <el-form v-loading="loading" 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 warehouseOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
+ <el-select v-model="formData.warehouseId" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option
+ v-for="item in warehouseOptions"
+ :key="item.id"
+ :label="item.warehouseName"
+ :value="item.id"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -15,6 +20,7 @@
<el-date-picker
v-model="formData.dealTime"
type="datetime"
+ clearable
value="yyyy-MM-dd HH:mm:ss"
value-format="yyyyMMddHHmmss"
placeholder="璇烽�夋嫨鏃ユ湡"
@@ -26,7 +32,7 @@
</el-row>
<el-row :gutter="24" class="headerHeight">
<el-col :span="24">
- <el-form-item label="鍑哄簱鎵嬬画" prop="procureDoc">
+ <el-form-item label="鍑哄簱鎵嬬画" prop="doc">
<upload ref="uploadRef" :settings="uploadSettings" @on-change="uploadChange"></upload>
</el-form-item>
</el-col>
@@ -36,7 +42,7 @@
<el-col :span="12">
<el-form-item
label="鐗╁搧鍒嗙被"
- :prop="`goods[${goodsIndex}].baseCategoryIds`"
+ :prop="`goods.${goodsIndex}.baseCategoryId`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -44,9 +50,13 @@
}"
>
<el-cascader
- v-model="goodsItem.baseCategoryIds"
+ v-model="goodsItem.baseCategoryId"
:options="categoryOptions"
- :props="{ value: 'id' }"
+ placeholder="璇烽�夋嫨鐗╁搧鍒嗙被"
+ :props="{ value: 'id',emitPath: false }"
+ :show-all-levels="false"
+ filterable
+ clearable
@change="categoryChange($event, goodsIndex)"
style="width: 100%"
></el-cascader>
@@ -55,17 +65,14 @@
<el-col :span="12">
<el-form-item
label="鐗╁搧鍚嶇О"
- :prop="`goods[${goodsIndex}].baseGoodsTemplateId`"
- :rules="{
- required: true,
- message: '璇烽�夋嫨',
- trigger: 'change',
- }"
+ :prop="`goods.${goodsIndex}.baseGoodsTemplateId`"
+ :rules="rules.baseGoodsTemplateId"
>
<el-select
v-model="goodsItem.baseGoodsTemplateId"
- placeholder="璇峰厛鎷╃墿鍝佸垎绫�"
+ :placeholder="goodsItem.baseCategoryId?'璇烽�夋嫨鐗╁搧':'璇峰厛閫夋嫨鐗╁搧鍒嗙被'"
filterable
+ clearable
:disabled="!goodsItem.baseCategoryId"
style="width: 100%"
@change="goodsTemplateChange($event, goodsIndex)"
@@ -84,20 +91,22 @@
<el-col :span="12">
<el-form-item
label="瑙勬牸鍨嬪彿"
- :prop="`goods[${goodsIndex}].modelsIds`"
+ :prop="`goods.${goodsIndex}.modelsIds`"
:rules="{
required: true,
- message: '璇烽�夋嫨',
+ message: '璇烽�夋嫨瑙勬牸鍨嬪彿',
trigger: 'change',
}"
>
<el-select
v-model="goodsItem.modelsIds"
multiple
- placeholder="璇峰厛鎷╃墿鍝佸悕绉�"
- :disabled="!goodsItem.baseCategoryId"
+ clearable
+ :placeholder="goodsItem.baseGoodsTemplateId?'璇烽�夋嫨瑙勬牸鍨嬪彿':'璇峰厛閫夋嫨鐗╁搧鍚嶇О'"
+ :disabled="!goodsItem.baseGoodsTemplateId"
@change="modelChange($event, goodsIndex)"
@remove-tag="modelRemoveTag($event, goodsIndex)"
+ @clear="modelRemoveTag(-1, goodsIndex)"
style="width: 100%"
>
<el-option
@@ -122,17 +131,23 @@
</template>
</el-table-column>
<el-table-column prop="price" label="鐜版湁搴撳瓨" align="center">
- <template slot-scope="scope">{{ }}
+ <template slot-scope="scope">
{{ scope.row.worehouseCount }}
</template>
</el-table-column>
<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"
+ :prop="`goods.${goodsIndex}.models.${scope.$index}.counts`"
+ :rules="rules.counts"
+ >
+ <el-input
+ type="number"
+ v-model="scope.row.counts"
+ @change="countsChange($event, goodsIndex, scope.$index)"
+ ></el-input>
+ </el-form-item>
</template>
</el-table-column>
</el-table>
@@ -161,27 +176,20 @@
</el-form>
<div slot="footer" align="center" class="dialog-footer">
<my-button name="鍙栨秷" site="form" @click="close" />
- <my-button name="淇濆瓨" site="form" @click="handleSubmit" />
+ <el-button name="淇濆瓨" type="primary" size="medium" :loading="btnloading" @click="handleSubmit">淇濆瓨</el-button>
</div>
</win-md>
</template>
<script>
-import {
- goodsTemplate,
- goodsModel,
- selectTenantWarehouse,
-} from '@/api/baseSetting/finsystenant';
-import {
- outputAdd,
- outputSelectNumber
-} from '@/api/stock/accessStock';
-import { getTree } from '@/api/foudation/classification';
+import {goodsModel, goodsTemplate, selectTenantWarehouse, warehouseSelectNumber,} from '@/api/baseSetting/finsystenant';
+import {outputAdd} from '@/api/stock/accessStock';
+import {getTree} from '@/api/foudation/classification';
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 {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import * as DateFormatter from "@/utils/DateFormatter";
export default {
components: { MyButton, winMd, upload },
@@ -192,15 +200,28 @@
},
},
data() {
+ // 鑷畾涔夋牎楠�
+ // 鐗╁搧閲嶅鏍￠獙
+ var checkGoodsTemplateId = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨'));
+ }
+ let temp = this.formData.goods.filter((v) => v.baseGoodsTemplateId == value);
+ if (!temp || temp.length != 1) {
+ return callback(new Error('宸查�夎繃姝ょ墿鍝�'));
+ }
+ callback();
+ };
return {
- loading: false,
+ loading: true,
+ btnloading: false,
warehouseOptions: [], // 鍑哄簱浠撳簱鍒楄〃
categoryOptions: [], // 鐗╁搧鍒嗙被鍒楄〃
modelList: [], //鍨嬪彿鍒楄〃
formData: {
warehouseId: '', // 鍑哄簱浠撳簱id
- dealTime: '', // 鍑哄簱鏃堕棿
- procureDoc: '',
+ dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 鍑哄簱鏃堕棿
+ doc: '',
goods: [],
},
goodsItem: {
@@ -216,25 +237,24 @@
modelsItem: {
baseGoodsModelsId: '', // 瑙勬牸鍨嬪彿缂栧彿
worehouseCount: 0,
- counts: 0, // 鎿嶄綔鏁伴噺
+ counts: null, // 鎿嶄綔鏁伴噺
unit: null, //鍗曚綅
+ totalAmount: 0, //鍗曚綅
},
rules: {
- warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- buyType: [{ 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' }],
+ warehouseId: [{ required: true, message: '璇烽�夋嫨浠撳簱', trigger: 'change' }],
+ dealTime: [{ required: true, message: '璇烽�夋嫨鏃堕棿', trigger: 'change' }],
+ doc: [{required: true, message: '璇蜂笂浼犲鎵规墜缁�', trigger: 'change'}],
+ baseCategoryId: [{ required: true, message: '璇烽�夋嫨鐗╁搧鍒嗙被', trigger: 'change' }],
+ baseGoodsTemplateId: [{ required: true, message: '璇烽�夋嫨鐗╁搧', trigger: 'change' },{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
+ modelsIds: [{ required: true, message: '璇烽�夋嫨瑙勬牸鍨嬪彿', trigger: 'change' }],
+ counts: [{ required: true, message: '璇疯緭鍏�', trigger: 'change' }],
},
uploadSettings: {
title: '涓婁紶',
max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
- accept: '.jpg,.png', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
@@ -243,25 +263,31 @@
},
};
},
+ computed: {
+ ...mapGetters(['userInfo']),
+ },
created() {
this.init();
},
methods: {
async init() {
- this.getWarehouseList();
- this.getgoodsTemplate();
- this.getgoodsModel();
+ await this.getWarehouseList();
+ await this.getgoodsTemplate();
+ await this.getgoodsModel();
// 鑾峰彇鐗╁搧鍒嗙被鍒楄〃
const treeRes = await getTree();
this.categoryOptions = this.removeEmptyChildren(treeRes);
- this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
+ this.loading = false
},
// 鑾峰彇鍑哄簱浠撳簱鍒楄〃
- getWarehouseList() {
- selectTenantWarehouse()
+ async getWarehouseList() {
+ await selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
.then((res) => {
this.warehouseOptions = res;
+ if (res.length) {
+ this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
+ }
if (this.warehouseOptions.length && !this.formData.warehouseId) {
// 榛樿閫変腑绗竴涓粨搴�
this.formData.warehouseId = this.warehouseOptions[0].id;
@@ -284,8 +310,8 @@
},
// 鑾峰彇鐗╁搧鍚嶇О鍒楄〃
- getgoodsTemplate(id, index) {
- goodsTemplate({ categoryId: id || '' }).then((res) => {
+ async getgoodsTemplate(id, index) {
+ await goodsTemplate({ agencyId: this.userInfo.tenantId, categoryId: id || '' }).then((res) => {
if (index || index == 0) {
this.$set(this.formData.goods[index], 'goodsOptions', res);
} else {
@@ -295,8 +321,8 @@
},
// 瑙勬牸鍨嬪彿
- getgoodsModel(id, index) {
- goodsModel({ goodsTemplatesId: id || '' }).then((res) => {
+ async getgoodsModel(id, index) {
+ await goodsModel({ goodsTemplatesId: id || '' }).then((res) => {
if (index || index == 0) {
this.$set(this.formData.goods[index], 'modelsOptions', res);
} else {
@@ -331,13 +357,11 @@
this.formData.goods[index].modelsOptions = [];
this.formData.goods[index].modelsIds = [];
this.formData.goods[index].models = [];
-
- this.formData.goods[index].baseCategoryId = e[e.length - 1];
// 鏍规嵁閫変腑鍒嗙被璇锋眰鐗╁搧鍚嶇О鍒楄〃
- this.getgoodsTemplate(e[e.length - 1], index);
+ this.getgoodsTemplate(e, index);
},
- // 鐗╁搧鍚嶇О鍒楄〃
+ // 鐗╁搧鍚嶇О鍒楄〃閫夋嫨
goodsTemplateChange(e, index) {
this.formData.goods[index].modelsOptions = [];
this.formData.goods[index].modelsIds = [];
@@ -352,12 +376,18 @@
async modelChange(e, index) {
let arr = [...this.formData.goods[index].models];
let str = JSON.stringify(arr);
- for(let item of e) {
+ for (let item of e) {
if (str.indexOf(item) == -1) {
let temp = this.goodsModelAll.find((v) => v.id == item);
// 鑾峰彇搴撳瓨
- let num = await outputSelectNumber({warehouseId:this.formData.warehouseId,baseGoodsModelsId:item})
- arr.push({ ...this.modelsItem, baseGoodsModelsId: item, unit: temp.unit,worehouseCount: num});
+ let num = await warehouseSelectNumber({
+ warehouseId: this.formData.warehouseId,
+ baseGoodsModelsId: item,
+ warehouseType: 0,
+ states: 1,
+ buyType: null,
+ });
+ arr.push({ ...this.modelsItem, baseGoodsModelsId: item, unit: temp.unit, worehouseCount: num });
}
}
this.formData.goods[index].models = arr;
@@ -365,6 +395,10 @@
// 瑙勬牸鍨嬪彿绉婚櫎
modelRemoveTag(e, index) {
+ if(e===-1){
+ this.formData.goods[index].models = []
+ return
+ }
let arr = this.formData.goods[index].models;
let delIndex = arr.findIndex((v) => v.baseGoodsModelsId == e);
this.formData.goods[index].models.splice(delIndex, 1);
@@ -372,8 +406,8 @@
// 涓婁紶
uploadChange() {
- let arr = this.$refs.uploadRef.fileList
- this.formData.procureDoc = JSON.stringify(arr)
+ let arr = this.$refs.uploadRef.fileList;
+ this.formData.doc = JSON.stringify(arr);
},
// 鐐瑰嚮鏂板鐗╁搧
@@ -387,12 +421,16 @@
},
// 鍑哄簱鏁伴噺鏍￠獙
- countsChange(e, goodsIndex,index) {
- const curItem = this.formData.goods[goodsIndex].models[index]
- const worehouseCount = curItem.worehouseCount
+ countsChange(e, goodsIndex, index) {
+ const curItem = this.formData.goods[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
+ curItem.counts = worehouseCount > 0 ? worehouseCount : null;
}
},
@@ -400,19 +438,27 @@
handleSubmit() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
+ if (this.loading) return
+ this.loading = true;
+ this.btnloading = true;
console.log('this.formData', this.formData);
- outputAdd(this.formData)
- .then((res) => {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- })
- .catch((err) => {
- console.log('edit err', err);
- this.$message.error('淇濆瓨澶辫触');
- });
+ outputAdd(this.formData)
+ .then((res) => {
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.btnloading = false;
+ this.loading = false;
+ this.close();
+ this.$emit('search');
+ })
+ .catch((err) => {
+ console.log('edit err', err);
+ this.btnloading = false;
+ this.loading = false;
+ this.$message.error('淇濆瓨澶辫触');
+ });
} else {
this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��');
+ this.btnloading = false;
}
});
},
@@ -424,42 +470,6 @@
goods: [],
};
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