From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
admin-web/src/views/stock/transfer/transferApplication/edit.vue | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index 2921487..d32845a 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -1,6 +1,6 @@
<template>
<win-md class="stock-edit" title="璋冩嫧鐢宠" @close="close" :width="'800px'">
- <el-form class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
+ <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">
@@ -11,10 +11,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璋冩嫧鏃堕棿" prop="createTime">
+ <el-form-item label="璋冩嫧鏃堕棿" clearable prop="createTime">
<el-date-picker
v-model="formData.createTime"
type="datetime"
+ clearable
value="yyyy-MM-dd HH:mm:ss"
value-format="yyyyMMddHHmmss"
placeholder="璇烽�夋嫨鏃ユ湡"
@@ -27,7 +28,7 @@
<el-row :gutter="24" class="headerHeight">
<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>
@@ -36,17 +37,20 @@
<el-col :span="12">
<el-form-item
label="鐗╁搧鍒嗙被"
- :prop="`transferGoods[${goodsIndex}].baseCategoryIds`"
+ :prop="`transferGoods.${goodsIndex}.baseCategoryId`"
:rules="{
required: true,
- message: '璇烽�夋嫨',
+ message: '璇烽�夋嫨鐗╁搧鍒嗙被',
trigger: 'change',
}"
>
<el-cascader
- v-model="goodsItem.baseCategoryIds"
+ v-model="goodsItem.baseCategoryId"
:options="categoryOptions"
- :props="{ value: 'id' }"
+ :props="{ value: 'id',emitPath: false }"
+ :show-all-levels="false"
+ filterable
+ clearable
@change="categoryChange($event, goodsIndex)"
style="width: 100%"
></el-cascader>
@@ -55,13 +59,14 @@
<el-col :span="12">
<el-form-item
label="鐗╁搧鍚嶇О"
- :prop="`transferGoods[${goodsIndex}].baseGoodsTemplateId`"
+ :prop="`transferGoods.${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)"
@@ -90,10 +95,12 @@
<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
@@ -169,14 +176,14 @@
</win-md>
</template>
<script>
-import { transferAdd } from '@/api/stock/transfer';
-import { getCategorySelectTree, goodsModel, warehouseSelectNumber } from '@/api/baseSetting/finsystenant';
-import { getParentTenant, queryWarehouseGoods } from '@/api/stock/transfer';
+import {getParentTenant, queryWarehouseGoods, transferAdd} from '@/api/stock/transfer';
+import {getCategorySelectTree, goodsModel, warehouseAllSelectNumber} from '@/api/baseSetting/finsystenant';
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 { mapGetters } from 'vuex';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import * as DateFormatter from "@/utils/DateFormatter";
export default {
components: { MyButton, winMd, upload },
@@ -200,14 +207,15 @@
callback();
};
return {
- loading: false,
+ loading: true,
agencyOptions: [], // 璋冩嫧鏈烘瀯
categoryOptions: [], // 鐗╁搧鍒嗙被鍒楄〃
modelList: [], //鍨嬪彿鍒楄〃
formData: {
transferBusinessType: 0, // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ procureDoc: '',
outAgencyId: '', // 璋冩嫧鏈烘瀯id
- createTime: '', // 璋冩嫧鏃堕棿
+ createTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 璋冩嫧鏃堕棿
transferGoods: [],
},
goodsItem: {
@@ -229,9 +237,9 @@
rules: {
outAgencyId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
createTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-
+ // procureDoc: [{ required: true, message: '璇蜂笂浼犺皟鎷ㄦ墜缁�', trigger: 'change' }],
baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
+ baseGoodsTemplateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' },{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
counts: [
{ required: true, message: '璇疯緭鍏�', trigger: 'change' },
@@ -243,12 +251,10 @@
title: '涓婁紶',
max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
num: 2, // 鏀寔涓婁紶鍥剧墖涓暟
- accept: '.jpg,.png', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'text', // text/picture
},
};
},
@@ -260,15 +266,16 @@
},
methods: {
async init() {
- this.handegetParentTenant();
+ await this.handegetParentTenant();
+ await this.getCategoryTree();
+ this.loading = false
this.getgoodsTemplate();
this.getgoodsModel();
- this.getCategoryTree();
},
// 鑾峰彇涓婄骇鏈烘瀯
- handegetParentTenant() {
- getParentTenant().then((res) => {
+ async handegetParentTenant() {
+ await getParentTenant().then((res) => {
if (res.id != this.userInfo.tenantId) {
this.agencyOptions = [res];
this.formData.outAgencyId = res.id;
@@ -344,10 +351,8 @@
this.formData.transferGoods[index].modelsOptions = [];
this.formData.transferGoods[index].modelsIds = [];
this.formData.transferGoods[index].models = [];
-
- this.formData.transferGoods[index].baseCategoryId = e[e.length - 1];
// 鏍规嵁閫変腑鍒嗙被璇锋眰鐗╁搧鍚嶇О鍒楄〃
- this.getgoodsTemplate(e[e.length - 1], index);
+ this.getgoodsTemplate(e, index);
},
// 鐗╁搧鍚嶇О鍒楄〃閫夋嫨
@@ -368,7 +373,7 @@
for (let item of e) {
if (str.indexOf(item) == -1) {
let temp = this.goodsModelAll.find((v) => v.id == item);
- let num = await warehouseSelectNumber({
+ let num = await warehouseAllSelectNumber({
baseGoodsModelsId: item,
warehouseType: 0,
states: 1,
@@ -383,6 +388,10 @@
// 瑙勬牸鍨嬪彿绉婚櫎
modelRemoveTag(e, index) {
+ if(e===-1){
+ this.formData.transferGoods[index].models = []
+ return
+ }
let arr = this.formData.transferGoods[index].models;
let delIndex = arr.findIndex((v) => v.baseGoodsModelsId == e);
this.formData.transferGoods[index].models.splice(delIndex, 1);
@@ -390,7 +399,8 @@
// 涓婁紶
uploadChange(e) {
- console.log('uploadChange', e);
+ let arr = this.$refs.uploadRef.fileList;
+ this.formData.procureDoc = JSON.stringify(arr);
},
// 鐐瑰嚮鏂板鐗╁搧
@@ -421,14 +431,17 @@
handleSubmit() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
- console.log('this.formData', this.formData);
+ if(this.loading) return
+ this.loading = true
transferAdd(this.formData)
.then((res) => {
+ this.loading = false
this.$message.success('淇濆瓨鎴愬姛锛�');
this.close();
this.$emit('search');
})
.catch((err) => {
+ this.loading = false
console.log('edit err', err);
this.$message.error('淇濆瓨澶辫触');
});
--
Gitblit v1.9.1