From c02eebb000f44d3c9d1ca187a8e984ce13d0cc33 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Sun, 23 Apr 2023 22:24:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/log/log.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/log/log.vue b/src/views/log/log.vue
index 020ecf4..6e3a97d 100644
--- a/src/views/log/log.vue
+++ b/src/views/log/log.vue
@@ -299,6 +299,12 @@
 			//检索-重置
 			_clickReset() {
 				this.searchObj = {};
+				this.pageInfo = ref({
+					total: 0,
+					limit: 10,
+					current: 1,
+					showRefresh: true
+				});
 				this._clickSearch();
 			}
 		}

From 16db24ca05bd3ed525f4d97137a56f83d696c9b7 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Sun, 23 Apr 2023 23:47:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/materia/all.vue                 | 12 +++++++++---
 src/views/materia/components/EditView.vue |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/materia/all.vue b/src/views/materia/all.vue
index aecdda8..f83ccbd 100644
--- a/src/views/materia/all.vue
+++ b/src/views/materia/all.vue
@@ -90,7 +90,7 @@
 				{
 					title: "ID",
 					key: "FID",
-					width: "80px",
+					width: "60px",
 					align: 'center',
 					hide: false
 				},
@@ -104,7 +104,7 @@
 				{
 					title: "物料号",
 					key: "FMaterialCode",
-					width: "160px",
+					width: "120px",
 					align: 'center',
 					hide: false
 				},
@@ -118,6 +118,12 @@
 				{
 					title: "产品分类",
 					key: "FMaterialTypeName",
+					width: "140px",
+					align: 'center'
+				},
+				{
+					title: "模式",
+					key: "FCreateFactoryName",
 					width: "200px",
 					align: 'center'
 				},
@@ -130,7 +136,7 @@
 				{
 					title: "发起人",
 					key: "FAddUserName",
-					width: "160px",
+					width: "120px",
 					align: 'center'
 				},
 				{
diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue
index b39b7c9..a3cbd21 100644
--- a/src/views/materia/components/EditView.vue
+++ b/src/views/materia/components/EditView.vue
@@ -358,7 +358,7 @@ export default {
 				})
 			}
 
-			if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) {
+			if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0 && this.dataInfoObj.FCanEdit != 2) {
 				this.dataColumn = ref([]);
 				this.setFreezingColumns();
 			}

From b992f284e1b651222cf1cd0be80501ce7d782585 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Mon, 24 Apr 2023 00:02:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Order/formula.vue | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/Order/formula.vue b/src/views/Order/formula.vue
index 0be7a18..58994e3 100644
--- a/src/views/Order/formula.vue
+++ b/src/views/Order/formula.vue
@@ -100,20 +100,26 @@
 
 	export default {
 		setup() {
-			let dataColumn = [{
+			let dataColumn = [
+				{
 					title: "PLM内码",
-					key: "FPlmCode"
-				}, {
+					key: "FPlmCode",
+					width: "200px"
+				}, 
+				{
 					title: "版本号",
 					key: "FVersionCode",
+					width: "60px"
 				},
 				{
 					title: "试验号",
-					key: "FTestCode"
+					key: "FTestCode",
+					width: "160px"
 				},
 				{
 					title: "配方描述",
-					key: "FName"
+					key: "FName",
+					width: "220px"
 				},
 				{
 					title: "配方类型",
@@ -122,13 +128,29 @@
 				},
 				{
 					title: "生产号",
-					key: "FProductCode"
+					key: "FProductCode",
+					width: "110px"
 				},
 				{
 					title: "工厂代码",
 					key: "FFactoryCode",
 					width: "110px"
 				},
+				{
+					title: "转规格人员",
+					key: "",
+					width: "110px"
+				},
+				{
+					title: "开发日期",
+					key: "",
+					width: "110px"
+				},
+				{
+					title: "BOM版本号",
+					key: "",
+					width: "110px"
+				},
 				{
 					title: "创建时间",
 					key: "FAddDate",