This commit is contained in:
ChenQiuYu 2025-05-28 11:32:31 +08:00
parent 9c45e8e44a
commit 69a6938734
2 changed files with 30 additions and 30 deletions

View File

@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="类型" style="display: flex"> <el-descriptions-item label="类型" style="display: flex">
<el-form-item label="" prop="cateId" class="form-item"> <el-form-item label="" class="form-item">
<el-select v-model="edit_data.cateId" placeholder="请选择" style="width: 70%"> <el-select v-model="edit_data.cateId" placeholder="请选择" style="width: 70%">
<el-option <el-option
v-for="item in cate_list" v-for="item in cate_list"
@ -689,10 +689,33 @@ const openContrastCodeSearch = () => {
const contrastCodeConfirm = (data: any) => { const contrastCodeConfirm = (data: any) => {
edit_data.value.hilistCode = data.hilistCode edit_data.value.hilistCode = data.hilistCode
} }
//
const rules = ref({
name: [
{required: true, message: '商品名称不能为空', trigger: 'blur'},
],
cateId: [
{required: true, message: '请选择商品类型', trigger: 'change'}
],
approvalCode: [
{required: true, message: '批准文号不能为空', trigger: 'blur'}
],
purchaseUnitPrice: [
{type: 'number', message: '必须为数字', trigger: 'blur'},
],
producer: [
{required: true, message: '生产企业不能为空', trigger: 'blur'}
],
makeUp: [
{required: true, message: '不能为空', trigger: 'blur'}
],
unitPrice: [
{type: 'number', message: '不能为空', trigger: 'blur'},
]
})
let save = async (isClose: Boolean) => { let save = async (isClose: Boolean) => {
try { try {
const isOk = await formRef.value.validate() await formRef.value.validate()
if (!isOk) return
if (!edit_data.value.purchaseUnitPrice || edit_data.value.purchaseUnitPrice < 1) { if (!edit_data.value.purchaseUnitPrice || edit_data.value.purchaseUnitPrice < 1) {
ElMessage.error('参考进价不能为空或小于1'); ElMessage.error('参考进价不能为空或小于1');
return return
@ -763,30 +786,7 @@ const returnInit = () => {
}) })
} }
//
const rules = ref({
name: [
{required: true, message: '商品名称不能为空', trigger: 'blur'},
],
cateId: [
{required: true, message: '请选择商品类型', trigger: 'change'}
],
approvalCode: [
{required: true, message: '批准文号不能为空', trigger: 'blur'}
],
purchaseUnitPrice: [
{type: 'number', message: '必须为数字', trigger: 'blur'},
],
producer: [
{required: true, message: '生产企业不能为空', trigger: 'blur'}
],
makeUp: [
{required: true, message: '不能为空', trigger: 'blur'}
],
unitPrice: [
{type: 'number', message: '不能为空', trigger: 'blur'},
]
})
// //
const formRef = ref() const formRef = ref()
const hilistInfo = ref<any>({}) const hilistInfo = ref<any>({})

View File

@ -62,7 +62,7 @@ const toExcel = () => {
} }
post(API.Inventory.Order.ToExcel, {cateIdList: cateIdList}).then((token: any) => { post(API.Inventory.Order.ToExcel, {cateIdList: cateIdList}).then((token: any) => {
loadConfig().then((res: any) => { loadConfig().then((res: any) => {
window.open(res.base_url + "file/download/" + token) window.open(res.base_url + API.Common.File.Download + '/' + token)
}) })
}) })
@ -130,14 +130,14 @@ const uploadFile = async () => {
formData.append('file', selectedFile.value); formData.append('file', selectedFile.value);
try { try {
const response = await axios.post(baseUrl.value + 'file/uploadToTemp', formData, { const response = await axios.post(baseUrl.value + API.Common.File.UploadToTemp, formData, {
headers: { headers: {
'Content-Type': 'multipart/form-data' 'Content-Type': 'multipart/form-data'
} }
}); });
let excelData = await post(API.Inventory.Order.FromExcel, {token: response.data}) let excelData = await post(API.Inventory.Order.FromExcel, {token: response.data})
close() close()
emit('initAddOrderData',excelData) emit('initAddOrderData', excelData)
} catch (error) { } catch (error) {
console.error('上传失败:', error); console.error('上传失败:', error);
} }