From 20913c80c3f5fc8e533cb92b90e6f20bcd68e032 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 17:49:32 +0800
Subject: [PATCH] feat: 1、优化导入 2、部门物品台账查询对接
---
admin-web/src/views/stock/scrap/itemScrapping/edit.vue | 265 +++++++++++++++++++++-------------------------------
1 files changed, 107 insertions(+), 158 deletions(-)
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index fd5ec9d..98b1f00 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -1,29 +1,31 @@
<template>
- <win-md class="stock-edit" :title="`${setting.title}鎶ュ簾鎶ュ簾`" @close="close" :width="'800px'">
+ <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">
<div class="main-w">
<el-row :gutter="24" class="headerHeight">
<el-col :span="12">
- <el-form-item label="鏈烘瀯" prop="warehouseId">
+ <el-form-item label="鏈烘瀯" prop="agencyName">
<el-input :value="formData.agencyName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎶ュ簾浠撳簱" prop="warehouseId">
- <el-input :value="formData.warehouseName" disabled></el-input>
+ <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-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="headerHeight">
<el-col :span="12">
- <el-form-item label="鎶ュ簾浜�" prop="buyType">
+ <el-form-item label="鎶ュ簾浜�" prop="operatorName">
<el-input :value="formData.operatorName" disabled></el-input>
</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"
@@ -36,17 +38,17 @@
</el-row>
<el-row :gutter="24" class="headerHeight">
<el-col :span="24">
- <el-form-item label="鎶ュ簾瀹℃壒鎵嬬画" prop="procureDoc">
+ <el-form-item label="鎶ュ簾瀹℃壒鎵嬬画" prop="uploadFiles">
<upload ref="uploadRef" :values="fileList" :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.scrappedGoodsInfo" :key="goodsIndex">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item
label="鐗╁搧鍒嗙被"
- :prop="`procureGoods[${goodsIndex}].baseCategoryIds`"
+ :prop="`scrappedGoodsInfo[${goodsIndex}].baseCategoryIds`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -65,12 +67,8 @@
<el-col :span="12">
<el-form-item
label="鐗╁搧鍚嶇О"
- :prop="`procureGoods[${goodsIndex}].baseGoodsTemplateId`"
- :rules="{
- required: true,
- message: '璇烽�夋嫨',
- trigger: 'change',
- }"
+ :prop="`scrappedGoodsInfo[${goodsIndex}].baseGoodsTemplateId`"
+ :rules="rules.baseGoodsTemplateId"
>
<el-select
v-model="goodsItem.baseGoodsTemplateId"
@@ -94,7 +92,7 @@
<el-col :span="12">
<el-form-item
label="瑙勬牸鍨嬪彿"
- :prop="`procureGoods[${goodsIndex}].modelsIds`"
+ :prop="`scrappedGoodsInfo[${goodsIndex}].modelsIds`"
:rules="{
required: true,
message: '璇烽�夋嫨',
@@ -120,33 +118,38 @@
</el-form-item>
</el-col>
</el-row>
- <el-table :data="goodsItem.models" :stripe="true">
+ <el-table :data="goodsItem.scrappedGoodsList" :stripe="true">
<el-table-column prop="baseGoodsModelsId" label="鍨嬪彿" align="center">
<template slot-scope="scope">
{{ getGoodsModelsName(scope.row.baseGoodsModelsId) }}
</template>
</el-table-column>
- <el-table-column prop="price" label="鍓╀綑鏁伴噺" align="center">
+ <el-table-column prop="total" label="鍓╀綑鏁伴噺" align="center">
<template slot-scope="scope">
- <el-input type="number" v-model="scope.row.price"></el-input>
+ {{ scope.row.total }}
</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"></el-input>
+ <el-input v-model.number="scope.row.counts"></el-input>
</template>
</el-table-column>
- <el-table-column prop="counts" label="鎶ュ簾鍘熷洜" align="center">
+ <el-table-column prop="scrappedCode" label="鎶ュ簾鍘熷洜" align="center">
<template slot-scope="scope">
- <el-select v-model="scope.row.modelsIds" multiple placeholder="璇烽�夋嫨">
- <el-option v-for="item in []" :key="item.id" :label="item.label" :value="item.id" />
+ <el-select v-model="scope.row.scrappedCode" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in scrapReasonOptions"
+ :key="item.dict_code"
+ :label="item.dict_label"
+ :value="item.dict_code"
+ />
</el-select>
</template>
</el-table-column>
</el-table>
<div class="btn-group">
<el-button
- v-if="formData.procureGoods.length > 1"
+ v-if="formData.scrappedGoodsInfo.length > 1"
name="绉婚櫎"
type="danger"
plain
@@ -155,7 +158,7 @@
>绉婚櫎</el-button
>
<el-button
- v-if="formData.procureGoods.length - 1 == goodsIndex"
+ v-if="formData.scrappedGoodsInfo.length - 1 == goodsIndex"
name="鏂板鐗╁搧"
type="primary"
plain
@@ -174,21 +177,15 @@
</win-md>
</template>
<script>
-import {
- goodsTemplate,
- procureAdd,
- procureEdit,
- selectTenantWarehouse,
- goodsModel,
- procureDetail,
-} from '@/api/stock/procure/purchaseOrder';
-import { getTree } from '@/api/foudation/classification';
+import {scrappedAdd} from '@/api/stock/scrap';
+import {goodsModel, goodsTemplate, selectTenantWarehouse, warehouseSelectNumber,} from '@/api/baseSetting/finsystenant';
+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, getDownUrl } from '@/utils/base';
-import { mapGetters } from 'vuex';
-import SettingIplatform from '../../../../../public/static/config';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import {getDicts} from '@/api/system/dict/data';
export default {
components: { MyButton, winMd, upload },
@@ -199,29 +196,29 @@
},
},
data() {
+ // 鑷畾涔夋牎楠�
+ // 鐗╁搧閲嶅鏍￠獙
+ var checkGoodsTemplateId = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨'));
+ }
+ let temp = this.formData.scrappedGoodsInfo.filter((v) => v.baseGoodsTemplateId == value);
+ if (!temp || temp.length != 1) {
+ return callback(new Error('宸查�夎繃姝ょ墿鍝�'));
+ }
+ callback();
+ };
return {
- visible: false,
loading: false,
- buyTypeOptions: [
- {
- label: '闆嗛噰',
- value: '1',
- },
- {
- label: '鑷噰',
- value: '2',
- },
- ],
fileList: [],
warehouses: [], // 鎶ュ簾浠撳簱鍒楄〃
categoryOptions: [], // 鐗╁搧鍒嗙被鍒楄〃
- modelList: [], //鍨嬪彿鍒楄〃
+ scrapReasonOptions: [], // 鎶ュ簾鍘熷洜鍒楄〃
formData: {
- procureDoc: '',
+ uploadFiles: '',
warehouseId: '', // 鎶ュ簾浠撳簱id
- procureTime: '', // 鎶ュ簾鏃堕棿
- buyType: '2', // 鎶ュ簾鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
- procureGoods: [],
+ dealTime: '', // 鎶ュ簾鏃堕棿
+ scrappedGoodsInfo: [],
},
goodsItem: {
baseCategoryIds: '', // 鍒嗙被缂栧彿鏁扮粍
@@ -231,21 +228,16 @@
sort: '', // 鏄剧ず椤哄簭
goodsOptions: [], // 鐗╁搧鍒楄〃select
modelsOptions: [], //瑙勬牸鍨嬪彿select
- models: [], // 鐗╁搧鍚嶇О
+ scrappedGoodsList: [], // 鐗╁搧鍚嶇О
modelsIds: [], //瑙勬牸鍨嬪彿
- },
- modelsItem: {
- baseGoodsModelsId: '', // 瑙勬牸鍨嬪彿缂栧彿
- counts: 0, // 鎿嶄綔鏁伴噺
},
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' }],
+ uploadFiles: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- baseGoodsTemplateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+ baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
},
@@ -253,7 +245,6 @@
title: '涓婁紶',
max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
- accept: '.jpg,.png', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: getUploadUrl(), // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
@@ -273,15 +264,16 @@
this.getWarehouseList();
this.getgoodsTemplate();
this.getgoodsModel();
- this.getCategoryTree();
- this.formData.procureGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
- this.formData.operatorId = this.userInfo.userCode;
- this.formData.operatorName = this.userInfo.id;
+ await this.getCategoryTree();
+ this.formData.scrappedGoodsInfo.push(JSON.parse(JSON.stringify(this.goodsItem)));
+ this.formData.operatorId = this.userInfo.id;
+ this.formData.operatorName = this.userInfo.userName;
this.formData.agencyId = this.userInfo.tenantId;
this.formData.agencyName = this.userInfo.tenantName;
- this.formData.warehouseId = this.userInfo.tenantId;
- this.formData.warehouseName = this.userInfo.tenantName;
- this.formData.WAREHOUSE_TYPE = 0;
+ this.formData.warehouseType = 0;
+ getDicts('SCRAP_REASON').then((res) => {
+ this.scrapReasonOptions = res;
+ });
},
async getCategoryTree() {
// 鑾峰彇鐗╁搧鍒嗙被鍒楄〃
@@ -291,7 +283,7 @@
// 鑾峰彇鎶ュ簾浠撳簱鍒楄〃
getWarehouseList() {
- selectTenantWarehouse()
+ selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
.then((res) => {
this.warehouses = res;
if (this.warehouses.length && !this.formData.warehouseId) {
@@ -319,7 +311,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.scrappedGoodsInfo[index], 'goodsOptions', res);
} else {
this.goodsTemplatelAll = res;
}
@@ -330,7 +322,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.scrappedGoodsInfo[index], 'modelsOptions', res);
} else {
this.goodsModelAll = res;
}
@@ -357,93 +349,86 @@
// 鐗╁搧鍒嗙被閫夋嫨
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.scrappedGoodsInfo[index].goodsOptions = [];
+ this.formData.scrappedGoodsInfo[index].baseGoodsTemplateId = '';
+ this.formData.scrappedGoodsInfo[index].goodsTemplateName = '';
+ this.formData.scrappedGoodsInfo[index].modelsOptions = [];
+ this.formData.scrappedGoodsInfo[index].modelsIds = [];
+ this.formData.scrappedGoodsInfo[index].scrappedGoodsList = [];
- this.formData.procureGoods[index].baseCategoryId = e[e.length - 1];
+ this.formData.scrappedGoodsInfo[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.scrappedGoodsInfo[index].modelsOptions = [];
+ this.formData.scrappedGoodsInfo[index].modelsIds = [];
+ this.formData.scrappedGoodsInfo[index].scrappedGoodsList = [];
- this.formData.procureGoods[index].goodsTemplateName = this.getGoodsTemplateName(e);
+ this.formData.scrappedGoodsInfo[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.scrappedGoodsInfo[index].scrappedGoodsList];
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 warehouseSelectNumber({
+ warehouseId: this.formData.warehouseId,
+ baseGoodsModelsId: item,
+ warehouseType: 0,
+ states: 1,
+ buyType: null,
+ });
+ arr.push({ baseGoodsModelsId: item, total: num, counts: null, scrappedCode: null });
}
- });
- this.formData.procureGoods[index].models = arr;
+ }
+ this.formData.scrappedGoodsInfo[index].scrappedGoodsList = arr;
},
// 瑙勬牸鍨嬪彿绉婚櫎
modelRemoveTag(e, index) {
- let arr = this.formData.procureGoods[index].models;
+ let arr = this.formData.scrappedGoodsInfo[index].scrappedGoodsList;
let delIndex = arr.findIndex((v) => v.baseGoodsModelsId == e);
- this.formData.procureGoods[index].models.splice(delIndex, 1);
+ this.formData.scrappedGoodsInfo[index].scrappedGoodsList.splice(delIndex, 1);
},
// 涓婁紶
uploadChange() {
let arr = this.$refs.uploadRef.fileList;
- this.formData.procureDoc = JSON.stringify(arr);
+ this.formData.uploadFiles = JSON.stringify(arr);
},
// 鐐瑰嚮鏂板鐗╁搧
addGoods() {
- this.formData.procureGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
+ this.formData.scrappedGoodsInfo.push(JSON.parse(JSON.stringify(this.goodsItem)));
},
// 鐐瑰嚮绉婚櫎
removeGoods(index) {
- this.formData.procureGoods.splice(index, 1);
+ this.formData.scrappedGoodsInfo.splice(index, 1);
},
// 鎻愪氦
handleSubmit() {
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('淇濆瓨澶辫触');
- });
- }
+ scrappedAdd(this.formData)
+ .then((res) => {
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
+ })
+ .catch((err) => {
+ console.log('create err', err);
+ this.$message.error('淇濆瓨澶辫触');
+ });
} else {
this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��');
}
@@ -453,46 +438,10 @@
close() {
this.formData = {
warehouseId: '', // 鎶ュ簾浠撳簱id
- procureTime: '', // 鎶ュ簾鏃堕棿
- procureGoods: [],
+ dealTime: '', // 鎶ュ簾鏃堕棿
+ scrappedGoodsInfo: [],
};
this.$emit('close');
- },
-
- // 閫氳繃瀛愰泦id鏌ュ埌鎵�浠ョ浉鍏崇埗绾d骞惰繑鍥炴暟缁�
- findParentIds(dataSource, nodeId) {
- const parentIds = [nodeId]; // 鐢ㄤ簬瀛樺偍鎵�鏈夌埗鑺傜偣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.unshift(node.id);
- return true;
- }
- }
- }
-
- return false; // 濡傛灉褰撳墠鑺傜偣涓嶆槸瀛愯妭鐐圭殑鐖惰妭鐐癸紝鍒欒繑鍥瀎alse
- }
-
- // 浠庢牴鑺傜偣寮�濮嬮亶鍘嗘暣妫垫爲锛屽苟璋冪敤閫掑綊鍑芥暟鏌ユ壘瀛愯妭鐐圭殑鎵�鏈夌埗鑺傜偣
- for (const node of dataSource) {
- if (traverse(node, nodeId)) {
- // 濡傛灉鍦ㄥ綋鍓嶈妭鐐圭殑瀛愭爲涓壘鍒颁簡瀛愯妭鐐圭殑鐖惰妭鐐癸紝鍒欑洿鎺ラ��鍑哄惊鐜�
- break;
- }
- }
-
- return parentIds; // 杩斿洖鎵�鏈夌埗鑺傜偣ID鐨勬暟缁�
},
},
};
--
Gitblit v1.9.1