From 32dce44249f1b3fb8487a154517c381d55123fbc Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 19:31:49 +0800
Subject: [PATCH] feat: 1、库存管理各种单据导出对接
---
admin-web/src/views/stock/scrap/itemScrapping/edit.vue | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index a4846ec..98b1f00 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -139,9 +139,9 @@
<el-select v-model="scope.row.scrappedCode" placeholder="璇烽�夋嫨">
<el-option
v-for="item in scrapReasonOptions"
- :key="item.dict_value"
+ :key="item.dict_code"
:label="item.dict_label"
- :value="item.dict_value"
+ :value="item.dict_code"
/>
</el-select>
</template>
@@ -177,21 +177,15 @@
</win-md>
</template>
<script>
-import { scrappedAdd } from '@/api/stock/scrap';
-import {
- goodsTemplate,
- selectTenantWarehouse,
- goodsModel,
- warehouseSelectNumber,
-} from '@/api/baseSetting/finsystenant';
-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 } from '@/utils/base';
-import { mapGetters } from 'vuex';
-import SettingIplatform from '../../../../../public/static/config';
-import { getDicts } from '@/api/system/dict/data';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import {getDicts} from '@/api/system/dict/data';
export default {
components: { MyButton, winMd, upload },
@@ -241,7 +235,6 @@
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-
uploadFiles: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
@@ -252,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, // 鏄惁鏀寔鎵归噺涓婁紶
@@ -272,7 +264,7 @@
this.getWarehouseList();
this.getgoodsTemplate();
this.getgoodsModel();
- this.getCategoryTree();
+ 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;
@@ -291,7 +283,7 @@
// 鑾峰彇鎶ュ簾浠撳簱鍒楄〃
getWarehouseList() {
- selectTenantWarehouse()
+ selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
.then((res) => {
this.warehouses = res;
if (this.warehouses.length && !this.formData.warehouseId) {
@@ -427,7 +419,6 @@
handleSubmit() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
- console.log('this.formData', this.formData);
scrappedAdd(this.formData)
.then((res) => {
this.$message.success('淇濆瓨鎴愬姛锛�');
--
Gitblit v1.9.1