From 13b0bad30ef1df53492cbab1c1b99dfc02dee63f Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期二, 21 十一月 2023 17:51:16 +0800
Subject: [PATCH] 台账管理，盘点任务开发
---
admin-web/src/views/stock/scrap/itemScrapping/edit.vue | 200 +++++++++++++++++++++++++++-----------------------
1 files changed, 108 insertions(+), 92 deletions(-)
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index 7c48f51..c24c442 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -1,28 +1,27 @@
<template>
- <el-dialog
- :title="`${type == 'create' ? '鏂板' : '缂栬緫'}${title}`"
- width="60%"
- :modal="true"
- :visible.sync="visible"
- :top="'15vh'"
- :close-on-click-modal="false"
- :append-to-body="true"
- :destroy-on-close="true"
- @close="close"
- class="stock-edit"
- >
+ <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-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 label="鏈烘瀯" prop="warehouseId">
+ <el-input :value="formData.agencyName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閲囪喘鏃堕棿" prop="procureTime">
+ <el-form-item label="鎶ュ簾浠撳簱" prop="warehouseId">
+ <el-input :value="formData.warehouseName" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24" class="headerHeight">
+ <el-col :span="12">
+ <el-form-item label="鎶ュ簾浜�" prop="buyType">
+ <el-input :value="formData.operatorName" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎶ュ簾鏃堕棿" prop="procureTime">
<el-date-picker
v-model="formData.procureTime"
type="datetime"
@@ -37,8 +36,8 @@
</el-row>
<el-row :gutter="24" class="headerHeight">
<el-col :span="24">
- <el-form-item label="閲囪喘鍏ュ簱鎵嬬画" prop="procureDoc">
- <upload :settings="uploadSettings" @on-change="uploadChange"></upload>
+ <el-form-item label="鎶ュ簾瀹℃壒鎵嬬画" prop="procureDoc">
+ <upload ref="uploadRef" :values="fileList" :settings="uploadSettings" @on-change="uploadChange"></upload>
</el-form-item>
</el-col>
</el-row>
@@ -120,31 +119,28 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="渚涜揣鍟�" prop="supplier">
- <el-input v-model="goodsItem.supplier" clearable maxlength="20" show-word-limit />
- </el-form-item>
- </el-col>
</el-row>
<el-table :data="goodsItem.models" :stripe="true">
- <el-table-column prop="baseGoodsModelsId" label="瑙勬牸鍨嬪彿" align="center">
+ <el-table-column prop="baseGoodsModelsId" label="鍨嬪彿" align="center">
<template slot-scope="scope">
{{ getGoodsModelsName(scope.row.baseGoodsModelsId) }}
</template>
</el-table-column>
- <el-table-column label="鍗曚綅" align="center">
- <template slot-scope="scope">
- {{ scope.row.unit }}
- </template>
- </el-table-column>
- <el-table-column prop="price" label="鍗曚环锛堝厓锛�" align="center">
+ <el-table-column prop="price" label="鍓╀綑鏁伴噺" align="center">
<template slot-scope="scope">
<el-input type="number" v-model="scope.row.price"></el-input>
</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"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="counts" 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>
</template>
</el-table-column>
</el-table>
@@ -172,10 +168,10 @@
</div>
</el-form>
<div slot="footer" align="center" class="dialog-footer">
- <el-button name="纭畾" site="form" type="primary" @click="handleSubmit">纭畾</el-button>
- <el-button name="鍙栨秷" site="form" @click="close">鍙栨秷</el-button>
+ <my-button name="鍙栨秷" site="form" @click="close" />
+ <my-button name="淇濆瓨" site="form" @click="handleSubmit" />
</div>
- </el-dialog>
+ </win-md>
</template>
<script>
import {
@@ -190,38 +186,48 @@
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 { getUploadUrl, getDownUrl } from '@/utils/base';
+import { mapGetters } from 'vuex';
import SettingIplatform from '../../../../../public/static/config';
export default {
components: { MyButton, winMd, upload },
props: {
- title: {
- type: String,
- default: '閲囪喘鍏ュ簱',
+ setting: {
+ type: Object,
+ default: () => {},
},
},
data() {
return {
- type: 'create',
visible: false,
loading: false,
- warehouses: [], // 鍏ュ簱浠撳簱鍒楄〃
+ buyTypeOptions: [
+ {
+ label: '闆嗛噰',
+ value: '1',
+ },
+ {
+ label: '鑷噰',
+ value: '2',
+ },
+ ],
+ fileList: [],
+ warehouses: [], // 鎶ュ簾浠撳簱鍒楄〃
categoryOptions: [], // 鐗╁搧鍒嗙被鍒楄〃
modelList: [], //鍨嬪彿鍒楄〃
formData: {
- warehouseId: '', // 鍏ュ簱浠撳簱id
- procureTime: '', // 閲囪喘鏃堕棿
+ procureDoc: '',
+ warehouseId: '', // 鎶ュ簾浠撳簱id
+ procureTime: '', // 鎶ュ簾鏃堕棿
+ buyType: '2', // 鎶ュ簾鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
procureGoods: [],
},
goodsItem: {
- whFormProcureId: '', // 閲囪喘鍗旾D
baseCategoryIds: '', // 鍒嗙被缂栧彿鏁扮粍
baseCategoryId: '', // 鍒嗙被缂栧彿
baseGoodsTemplateId: '', // 鐗╁搧妯＄増缂栧彿
goodsTemplateName: '', // 鐗╁搧妯＄増鍚嶇О
- supplier: '', // 渚涘簲鍟�
sort: '', // 鏄剧ず椤哄簭
goodsOptions: [], // 鐗╁搧鍒楄〃select
modelsOptions: [], //瑙勬牸鍨嬪彿select
@@ -230,16 +236,14 @@
},
modelsItem: {
baseGoodsModelsId: '', // 瑙勬牸鍨嬪彿缂栧彿
- price: 0, // 鍗曚环(閲囪喘闇�瑕侊紝璋冩嫧涓嶉渶瑕�)
counts: 0, // 鎿嶄綔鏁伴噺
- supplier: '', // 渚涘簲鍟�
- unit: null, //鍗曚綅
},
rules: {
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
procureTime: [{ 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,47 +252,44 @@
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
},
};
},
- created() {},
+ computed: {
+ ...mapGetters(['userInfo']),
+ },
+ created() {
+ this.init();
+ },
methods: {
- async open(id) {
+ async init() {
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.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.warehouseType = 0;
+ },
+ async getCategoryTree() {
// 鑾峰彇鐗╁搧鍒嗙被鍒楄〃
const treeRes = await getTree();
this.categoryOptions = this.removeEmptyChildren(treeRes);
- if (id) {
- this.type = 'edit';
- const detail = await procureDetail({ id });
- console.log('procureDetail', detail);
- this.formData = Object.assign(this.formData, detail);
- 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];
- item.modelsIds = item.models.map((v) => v.baseGoodsModelsId);
- this.getgoodsTemplate(item.baseCategoryId, index);
- this.getgoodsModel(item.baseGoodsTemplateId, index);
- });
- } else {
- this.type = 'create';
- this.formData.procureGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
- }
- this.visible = true;
},
- // 鑾峰彇鍏ュ簱浠撳簱鍒楄〃
+ // 鑾峰彇鎶ュ簾浠撳簱鍒楄〃
getWarehouseList() {
selectTenantWarehouse()
.then((res) => {
@@ -319,6 +320,8 @@
goodsTemplate({ categoryId: id || '' }).then((res) => {
if (index || index == 0) {
this.$set(this.formData.procureGoods[index], 'goodsOptions', res);
+ } else {
+ this.goodsTemplatelAll = res;
}
});
},
@@ -334,6 +337,15 @@
});
},
+ // 鏍规嵁鐗╁搧鍚嶇Оid鑾峰彇鍚嶅瓧
+ getGoodsTemplateName(id) {
+ let item = this.goodsTemplatelAll.find((v) => v.id == id);
+ if (item) {
+ return item.goodsName;
+ }
+ return;
+ },
+
// 鏍规嵁瑙勬牸鍨嬪彿id鑾峰彇鍚嶅瓧
getGoodsModelsName(id) {
let item = this.goodsModelAll.find((v) => v.id == id);
@@ -345,9 +357,12 @@
// 鐗╁搧鍒嗙被閫夋嫨
categoryChange(e, index) {
- this.formData.procureGoods[index].goodsOptions = []
- this.formData.procureGoods[index].baseGoodsTemplateId = ''
- this.formData.procureGoods[index].goodsTemplateName = ''
+ 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.procureGoods[index].baseCategoryId = e[e.length - 1];
// 鏍规嵁閫変腑鍒嗙被璇锋眰鐗╁搧鍚嶇О鍒楄〃
@@ -356,11 +371,11 @@
// 鐗╁搧鍚嶇О鍒楄〃
goodsTemplateChange(e, index) {
- this.formData.procureGoods[index].modelsOptions = []
- this.formData.procureGoods[index].modelsIds = []
- this.formData.procureGoods[index].models = []
+ this.formData.procureGoods[index].modelsOptions = [];
+ this.formData.procureGoods[index].modelsIds = [];
+ this.formData.procureGoods[index].models = [];
- this.formData.goodsTemplateName = this.getGoodsModelsName(e)
+ this.formData.procureGoods[index].goodsTemplateName = this.getGoodsTemplateName(e);
// 鏍规嵁閫変腑鐗╁搧鍚嶇Оid鑾峰彇瑙勬牸鍨嬪彿鍒楄〃
this.getgoodsModel(e, index);
},
@@ -386,8 +401,9 @@
},
// 涓婁紶
- uploadChange(e) {
- console.log('uploadChange', e);
+ uploadChange() {
+ let arr = this.$refs.uploadRef.fileList;
+ this.formData.procureDoc = JSON.stringify(arr);
},
// 鐐瑰嚮鏂板鐗╁搧
@@ -405,7 +421,7 @@
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
console.log('this.formData', this.formData);
- if (this.type == 'create') {
+ if (!this.setting.id) {
procureAdd(this.formData)
.then((res) => {
this.$message.success('淇濆瓨鎴愬姛锛�');
@@ -435,17 +451,17 @@
},
close() {
- this.formData ={
- warehouseId: '', // 鍏ュ簱浠撳簱id
- procureTime: '', // 閲囪喘鏃堕棿
+ this.formData = {
+ warehouseId: '', // 鎶ュ簾浠撳簱id
+ procureTime: '', // 鎶ュ簾鏃堕棿
procureGoods: [],
- }
- this.visible = false;
+ };
+ this.$emit('close');
},
// 閫氳繃瀛愰泦id鏌ュ埌鎵�浠ョ浉鍏崇埗绾d骞惰繑鍥炴暟缁�
findParentIds(dataSource, nodeId) {
- const parentIds = []; // 鐢ㄤ簬瀛樺偍鎵�鏈夌埗鑺傜偣ID鐨勬暟缁�
+ const parentIds = [nodeId]; // 鐢ㄤ簬瀛樺偍鎵�鏈夌埗鑺傜偣ID鐨勬暟缁�
// 瀹氫箟涓�涓�掑綊鍑芥暟锛岀敤浜庨亶鍘嗘暣妫垫爲骞舵煡鎵惧瓙鑺傜偣鐨勬墍鏈夌埗鑺傜偣
function traverse(node, nodeId) {
@@ -459,7 +475,7 @@
for (const childNode of node.children) {
if (traverse(childNode, nodeId)) {
// 濡傛灉鍦ㄥ瓙鑺傜偣涓壘鍒颁簡瀛愯妭鐐圭殑鐖惰妭鐐癸紝鍒欏皢褰撳墠鑺傜偣鐨処D娣诲姞鍒扮埗鑺傜偣ID鏁扮粍涓紝骞惰繑鍥瀟rue琛ㄧず宸茬粡鎵惧埌浜嗗瓙鑺傜偣
- parentIds.push(node.id);
+ parentIds.unshift(node.id);
return true;
}
}
--
Gitblit v1.9.1