From fed1f885b03a5b4b7c62d44320c3ff2068ca02e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Feb 2021 11:01:24 +0800
Subject: [PATCH] confict
---
zq-erp/src/main/resources/templates/views/admin/hive/store/outStore-form.html | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/store/outStore-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/store/outStore-form.html
index 2eee6c7..0a1d22f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/store/outStore-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/store/outStore-form.html
@@ -233,7 +233,7 @@
<el-table-column
label="数量">
<template slot-scope="scope">
- <el-form-item :prop="'assembleGoods.'+ scope.$index +'.amount'" :rules="rules.count">
+ <el-form-item :prop="'assembleGoods.'+ scope.$index +'.amount'" >
<el-input v-model.number="scope.row.amount"></el-input>
</el-form-item>
</template>
@@ -279,10 +279,6 @@
],
warehouseData : [
{ required: true, message: '请选择仓库', trigger: 'change' }
- ],
- count : [
- { required: true, message: '请输入信息', trigger: 'blur' },
- { type : 'number', message: '请输入数字', trigger: 'blur' }
],
},
outStoreTypeData : [],
--
Gitblit v1.9.1