Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

3 years ago · 2cdb3fba97
parent b6b699569a a10294f776
commit 2cdb3fba97
3 changed files with 561 additions and 560 deletions
--- a/src/styles/admin.css
+++ b/src/styles/admin.css
@ -123,14 +123,14 @@
 }

 .one{
-	background: #00B0F0 !important;;
+	background: #404040 !important;;
 }
 .twe{
-	background: #00FF00!important;
+	background: #F764FF!important;
 }
 .three{
-	background:#FF6464!important;
+	background:#F66464!important;
 }
 .four{
-	background: #FF64FF!important;
+	background: #51FF00!important;
 }
--- a/src/views/Need/components/PackageItem.vue
+++ b/src/views/Need/components/PackageItem.vue
@ -164,6 +164,7 @@
 			},
 			async submitClick() {
 				if (!this.editDataInfo.FName) return this.editDataInfo.FName = "";
+				if (!this.editDataInfo.FUnit) return this.editDataInfo.FUnit = "";
 				let result = await getPageList({
 					FPageIndex: 1,
 					FPageSize: 1,
--- a/src/views/Order/components/EditMaterialInfo.vue
+++ b/src/views/Order/components/EditMaterialInfo.vue