From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/procure/purchaseOrder/edit.vue | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/edit.vue b/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
index 7d8cc0c..e5afac4 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
@@ -1,5 +1,5 @@
<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'" :loading="loading">
<el-form class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
<div class="main-w">
<el-row :gutter="24" class="headerHeight">
@@ -229,7 +229,6 @@
};
// 閲戦鏍￠獙
var checkPrice = (rule, value, callback) => {
- console.log(value);
if (!value) {
return callback(new Error('璇疯緭鍏�'));
}
@@ -241,7 +240,6 @@
};
// 鏁伴噺鏍￠獙
var checkCounts = (rule, value, callback) => {
- console.log(value);
if (!value) {
return callback(new Error('璇疯緭鍏�'));
}
@@ -256,7 +254,7 @@
callback();
};
return {
- loading: false,
+ loading: true,
buyTypeOptions: [
{
label: '闆嗛噰',
@@ -314,7 +312,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, // 鏄惁鏀寔鎵归噺涓婁紶
@@ -361,6 +358,7 @@
return item;
});
}
+ this.loading = false;
},
// 鑾峰彇鍏ュ簱浠撳簱鍒楄〃
@@ -502,8 +500,7 @@
handleSubmit() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
- console.log('formData', this.formData);
- debugger;
+ this.loading = true;
if (!this.setting.id) {
procureAdd(this.formData)
.then((res) => {
@@ -512,7 +509,7 @@
this.$emit('search');
})
.catch((err) => {
- console.log('create err', err);
+ this.loading = false;
this.$message.error('淇濆瓨澶辫触');
});
} else {
@@ -523,7 +520,7 @@
this.$emit('search');
})
.catch((err) => {
- console.log('edit err', err);
+ this.loading = false;
this.$message.error('淇濆瓨澶辫触');
});
}
--
Gitblit v1.9.1