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

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",

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();
 			}
 		}

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'
 				},
 				{

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();
 			}