From c138755a546b1b6c389d2b136564c442d447eca4 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Tue, 31 Dec 2024 09:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/materialPricing/add-or-updata.vue    |  8 ++++----
 src/views/base/materialPricing/index.vue      | 10 +++++-----
 .../cost/raw/costMaterial/add-or-updata.vue   |  6 +++---
 src/views/cost/raw/costMaterial/index.vue     | 20 +++++++++----------
 src/views/login.vue                           |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/base/materialPricing/add-or-updata.vue b/src/views/base/materialPricing/add-or-updata.vue
index 4cda5a5d..ed3fce5f 100644
--- a/src/views/base/materialPricing/add-or-updata.vue
+++ b/src/views/base/materialPricing/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-11 09:05:16
+ * @LastEditTime: 2024-12-27 09:16:43
  * @Description:
 -->
 <template>
@@ -56,17 +56,17 @@
 						placeholder="选择结束时间"></el-date-picker>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<!-- <el-col :span="12">
 				<el-form-item label="单价" prop="price">
 					<el-input-number
 						:min="0"
 						style="width: 75%"
 						v-model="dataForm.price"
 						clearable
-						placeholder="请输入允许留存时间" />
+						placeholder="请输入单价" />
 					{{ unit }}
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 			<el-col :span="12">
 				<el-form-item label="备注" prop="remark">
 					<el-input
diff --git a/src/views/base/materialPricing/index.vue b/src/views/base/materialPricing/index.vue
index 8ded58c4..b460d22b 100644
--- a/src/views/base/materialPricing/index.vue
+++ b/src/views/base/materialPricing/index.vue
@@ -63,11 +63,11 @@ const tableProps = [
 		label: '原料编码',
 		width: 180,
 	},
-	{
-		prop: 'price',
-		label: '单价(元/千克)',
-		align: 'right',
-	},
+	// {
+	// 	prop: 'price',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'createTime',
 		label: '生效时间',
diff --git a/src/views/cost/raw/costMaterial/add-or-updata.vue b/src/views/cost/raw/costMaterial/add-or-updata.vue
index f9e04897..2f7afc71 100644
--- a/src/views/cost/raw/costMaterial/add-or-updata.vue
+++ b/src/views/cost/raw/costMaterial/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:34:28
+ * @LastEditTime: 2024-12-27 09:18:43
  * @Description:
 -->
 <template>
@@ -22,7 +22,7 @@
 						placeholder="请输入原料名称" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<!-- <el-col :span="12">
 				<el-form-item label="单价" prop="matPrice">
 					<el-input
 						v-model="dataForm.matPrice"
@@ -31,7 +31,7 @@
 						placeholder="请输入单价" />
 					(元/吨)
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 			<el-col :span="12">
 				<el-form-item label="累计用量" prop="quantity">
 					<el-input-number
diff --git a/src/views/cost/raw/costMaterial/index.vue b/src/views/cost/raw/costMaterial/index.vue
index 13a4df4c..d25e6150 100644
--- a/src/views/cost/raw/costMaterial/index.vue
+++ b/src/views/cost/raw/costMaterial/index.vue
@@ -103,11 +103,11 @@ const tableProps = [
 		prop: 'quantity',
 		label: '累计使用量(千克)',
 	},
-	{
-		prop: 'matPrice',
-		label: '单价(元/千克)',
-		align: 'right',
-	},
+	// {
+	// 	prop: 'matPrice',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
@@ -133,11 +133,11 @@ const tableProps2 = [
 		prop: 'quantity',
 		label: '累计使用量(千克)',
 	},
-	{
-		prop: 'materialPrice',
-		label: '单价(元/千克)',
-		align: 'right',
-	},
+	// {
+	// 	prop: 'materialPrice',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
diff --git a/src/views/login.vue b/src/views/login.vue
index 691c112f..0158efa0 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -298,7 +298,7 @@ export default {
 			loginForm: {
 				loginType: 'uname',
 				username: '',//admin
-				password: '',//admin123
+				password: '',//admin123 kszny123456
 				captchaVerification: '',
 				mobile: '',
 				mobileCode: '',