From b323576f7aa91f822d1755cf0085457943480d85 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Sat, 8 Apr 2023 22:41:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E9=85=8D=E6=96=B9=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Need/components/EditView.vue    |   6 +-
 src/views/Need/components/FormulaView.vue | 122 ++++++++++++++++++++++
 2 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 src/views/Need/components/FormulaView.vue

diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 714c7ba..e29209e 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -1,5 +1,6 @@
 <template>
 	<lay-container fluid="true" class="content-box">
+		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
 		<lay-table class="row-select" v-if="dataColumn.length>0" height="320px" :columns="dataColumn"
 				   :data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName">
 			<template v-slot:toolbar v-if="dataInfoObj.FCanEdit!=2">
@@ -101,10 +102,12 @@
 		changeInfoData
 	} from "/src/api/api/materialType";
 	import OperateLog from "./OperateLog.vue";
+	import FormulaView from "./FormulaView.vue";
 
 	export default {
 		components: {
-			OperateLog
+			OperateLog,
+			FormulaView
 		},
 		setup() {
 			const dataColumn = ref([]);
@@ -164,6 +167,7 @@
 		},
 		methods: {
 			async getUserPower() {
+				console.log('this.dataInfoObj', this.dataInfoObj);
 				if (this.dataInfoObj.FCanEdit != 2) {
 					this.userPower[0] = (await getBasicRoleList({
 						FRoleType: 40,
diff --git a/src/views/Need/components/FormulaView.vue b/src/views/Need/components/FormulaView.vue
new file mode 100644
index 0000000..f92f2d3
--- /dev/null
+++ b/src/views/Need/components/FormulaView.vue
@@ -0,0 +1,122 @@
+<template>
+    <lay-table style="margin:0 0 30px 0;" height="200px" :columns="dataColumn" :data-source="dataList">
+		<template v-slot:toolbar>
+			<p style="float:left;">配方视图</p>
+		</template>
+	</lay-table>
+</template>
+<script>
+    import {
+		ref
+	} from 'vue';
+    import {
+		getTeamworkView
+	} from "/src/api/api/teamwork";
+
+    export default {
+        setup() {
+            const viewList = ref([]);
+            const dataColumn = ref([
+                {type: 'number', title: '序号', width: '56'},
+                {key: '工厂', title: '工厂', align: 'center', width: '130px'},
+                {key: '开始生效日期', title: '开始生效日期', align: 'center', width: '130px'},
+                {key: 'BOM用途', title: 'BOM用途', align: 'center', width: '130px'},
+                {key: 'BOM状态', title: 'BOM状态', align: 'center', width: '130px'},
+                {key: '可选文本', title: '可选文本', align: 'center', width: '130px'},
+                {key: '可选BOM', title: '可选BOM', align: 'center', width: '130px'},
+                {key: '父项编码', title: '父项编码', align: 'center', width: '200px'},
+                {key: '父项描述', title: '父项描述', align: 'center', width: '300px'},
+                {key: '基本数量', title: '基本数量', align: 'center', width: '130px'},
+                {key: '基本单位', title: '基本单位', align: 'center', width: '130px'},
+                {key: '子项序号', title: '子项序号', align: 'center', width: '130px'},
+                {key: '项目类别', title: '项目类别', align: 'center', width: '130px'},
+                {key: '子项编码', title: '子项编码', align: 'center', width: '200px'},
+                {key: '子件描述', title: '子件描述', align: 'center', width: '300px'},
+                {key: '组件数量', title: '组件数量', align: 'center', width: '130px'},
+                {key: '计量单位', title: '计量单位', align: 'center', width: '130px'},
+                {key: '工程变更号', title: '工程变更号', align: 'center', width: '130px'},
+                {key: '项目ID', title: '项目ID', align: 'center', width: '130px'},
+                {key: '物料供应标识符', title: '物料供应标识符', align: 'center', width: '130px'},
+                {key: '备件标示', title: '备件标示', align: 'center', width: '130px'},
+                {key: '生产仓储地点', title: '生产仓储地点', align: 'center', width: '130px'},
+                {key: '组件损耗率', title: '组件损耗率', align: 'center', width: '130px'},
+                {key: '成本核算标识相关', title: '成本核算标识相关', align: 'center', width: '130px'},
+                {key: '生产相关', title: '生产相关', align: 'center', width: '130px'},
+                {key: 'BOM项目文本1', title: 'BOM项目文本1', align: 'center', width: '130px'},
+                {key: 'BOM项目文本2', title: 'BOM项目文本2', align: 'center', width: '130px'},
+                {key: '替代项目组', title: '替代项目组', align: 'center', width: '130px'},
+                {key: '优先级', title: '优先级', align: 'center', width: '130px'},
+                {key: '策略', title: '策略', align: 'center', width: '130px'},
+                {key: '使用可能性', title: '使用可能性', align: 'center', width: '130px'},
+                {key: '固定损耗数量', title: '固定损耗数量', align: 'center', width: '130px'}
+            ]);
+            const dataList = ref([]);
+
+            return {
+                viewList,
+				dataColumn,
+				dataList
+			}
+        },
+        props: {
+			teamId: {
+				type: String,
+				default: () => ""
+			},
+            halfId: {
+                type: String,
+                default: () => ""
+            }
+		},
+        mounted() {
+            this.initPage();
+		},
+        methods: {
+            async initPage() {
+                let dataColumn = [{
+					type: "number",
+					title: "序号",
+					width: "56"
+				}];
+                let dataList = [];
+
+                console.log('this.teamId', this.teamId);
+                console.log('this.halfId', this.halfId);
+
+				let postData = {
+					FTeamID: this.teamId,
+					FViewType: 2,
+					FType: 1,
+					HalfId : this.halfId
+				};
+
+				let result = await getTeamworkView(postData);
+
+                let formulaList = result["List1"]
+
+                if (formulaList) {
+                    console.log('formulaList', formulaList);
+                    for (let key in formulaList[0]) {
+                        let width = (key.indexOf("描述") != -1 || key == "文本" || key == "物料") ? "300px" :
+                            "130px";
+                        width = key.indexOf("编码") != -1 ? "200px" : width;
+                        dataColumn.push({
+                            key: key,
+                            title: key.split('.').pop(),
+                            align: "center",
+                            width: width
+                        });
+                    }
+                    
+                    formulaList.forEach((item) => {
+                        dataList.push(item);
+                    });
+                }
+                
+                // this.dataColumn = dataColumn;
+				this.dataList = dataList;
+            }
+        }
+    }
+
+</script>
\ No newline at end of file

From 50c936de4eafaef1e1b95d223bbc5483e771c7e7 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Mon, 10 Apr 2023 19:12:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=97=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Need/components/EditView.vue        | 76 +++++++++++++++---
 src/views/Need/components/FormulaView.vue     |  4 -
 .../Need/components/FreezingColumnSetting.vue | 78 +++++++++++++++++++
 3 files changed, 145 insertions(+), 13 deletions(-)
 create mode 100644 src/views/Need/components/FreezingColumnSetting.vue

diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index e29209e..8349849 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -1,18 +1,23 @@
 <template>
 	<lay-container fluid="true" class="content-box">
 		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
-		<lay-table class="row-select" v-if="dataColumn.length>0" height="320px" :columns="dataColumn"
+		
+		<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置">
+			<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="tmpDataColumn" :freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
+		</lay-layer>
+		<lay-table id="dataTable" v-if="dataColumn.length>0" height="320px" :columns="dataColumn"
 				   :data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName">
 			<template v-slot:toolbar v-if="dataInfoObj.FCanEdit!=2">
 				<lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length===0">保存
 				</lay-button>
-				<!--				<lay-button size="sm" type="primary" :class="this.isBomShow ? 'isBomShow' : 'isBomHidden'" @click="changeVisible2">查看BOM配方</lay-button>-->
 				<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true">
 					<template #prepend>半成品编号：</template>
 				</lay-input>
 				<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputDescValue" :readonly="true">
 					<template #prepend>描述：</template>
 				</lay-input>
+				<lay-button size="sm" type="primary" style="float:right;" :disabled="editColumn.length===0" @click="_clickFreezingColumnSetting()">固定项
+				</lay-button>
 			</template>
 			<template v-for="item in editColumn" v-slot:[item.key]="{ data }">
 				<lay-select v-if="item.key=='FTypeID1'" size="sm" v-model="data['FTypeID1']"
@@ -33,9 +38,6 @@
 			</template>
 		</lay-table>
 		<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog>
-		<!--		<lay-layer title="标题" :move="false" v-model="visible2">-->
-		<!--			内容-->
-		<!--		</lay-layer>-->
 	</lay-container>
 </template>
 
@@ -103,11 +105,13 @@
 	} from "/src/api/api/materialType";
 	import OperateLog from "./OperateLog.vue";
 	import FormulaView from "./FormulaView.vue";
+	import FreezingColumnSetting from './FreezingColumnSetting.vue';
 
 	export default {
 		components: {
 			OperateLog,
-			FormulaView
+			FormulaView,
+			FreezingColumnSetting
 		},
 		setup() {
 			const dataColumn = ref([]);
@@ -134,7 +138,10 @@
 			const visible2 = ref(false)
 			const changeVisible2 = function() {
 				visible2.value = !visible2.value
-			}
+			};
+			const showFreezingColumnSettingBox = ref(false);
+			const freezingColumnSetting = ref([]);
+			const tmpDataColumn = ref([]);
 			return {
 				dataColumn,
 				dataList,
@@ -149,7 +156,10 @@
 				isShow: false,
 				isBomShow :false,
 				visible2,
-				changeVisible2
+				changeVisible2,
+				showFreezingColumnSettingBox,
+				freezingColumnSetting,
+				tmpDataColumn
 			};
 		},
 		props: {
@@ -167,7 +177,6 @@
 		},
 		methods: {
 			async getUserPower() {
-				console.log('this.dataInfoObj', this.dataInfoObj);
 				if (this.dataInfoObj.FCanEdit != 2) {
 					this.userPower[0] = (await getBasicRoleList({
 						FRoleType: 40,
@@ -260,6 +269,7 @@
 				this.editColumn = editColumn;
 				this.dataList = _data.rows;
 				this.dataColumn = dataColumn;
+
 				setTimeout(function() {
 					layer.close(idx);
 				}, 500);
@@ -346,6 +356,54 @@
 					layer.close(idx);
 					layer.msg('您没有做任何更改')
 				}
+			},
+			_clickFreezingColumnSetting() {
+				this.tmpDataColumn = this.dataColumn;
+				this.dataColumn = ref([]);
+				this.showFreezingColumnSettingBox = true;
+				console.log('before', this.tmpDataColumn);
+			},
+			setFreezingColumns() {
+				let freezingColumns = [];
+				if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) {
+					this.freezingColumnSetting.forEach(column => {
+						let colIndex = this.tmpDataColumn.findIndex(d => d.key === column);
+						if (colIndex >= 0) {
+							let proxyFc = this.tmpDataColumn.splice(colIndex, 1)[0];
+							const {proxy, revoke} = Proxy.revocable(proxyFc, {});
+							const fc = {...proxy};
+							revoke();
+							console.log('fc', fc);
+							if (fc) {
+								fc.fixed = "left";
+								freezingColumns.push(fc);
+							}
+						}
+					})
+				}
+
+				if (freezingColumns && freezingColumns.length > 0) {
+					for(let i=freezingColumns.length-1; i>=0; i--) {
+						this.tmpDataColumn.unshift(freezingColumns[i]);
+					}
+					
+					// freezingColumns = freezingColumns.concat(this.tmpDataColumn);
+					this.dataColumn = this.tmpDataColumn;
+					console.log('after', this.dataColumn);
+				} else {
+					this.dataColumn = this.tmpDataColumn;
+				}
+			},
+			setFreezingColumnsSetting(fcs) {
+				if (fcs && fcs.length > 0) {
+					this.freezingColumnSetting = fcs;
+					// this.freezingColumnSetting = ["FTestCode", "FMaterialGroup", "FWorkCenter"];
+					this.setFreezingColumns();
+				} else {
+					this.dataColumn = this.tmpDataColumn;
+				}
+				
+				this.showFreezingColumnSettingBox = false;
 			}
 		}
 	}
diff --git a/src/views/Need/components/FormulaView.vue b/src/views/Need/components/FormulaView.vue
index f92f2d3..58c751d 100644
--- a/src/views/Need/components/FormulaView.vue
+++ b/src/views/Need/components/FormulaView.vue
@@ -80,9 +80,6 @@
 				}];
                 let dataList = [];
 
-                console.log('this.teamId', this.teamId);
-                console.log('this.halfId', this.halfId);
-
 				let postData = {
 					FTeamID: this.teamId,
 					FViewType: 2,
@@ -95,7 +92,6 @@
                 let formulaList = result["List1"]
 
                 if (formulaList) {
-                    console.log('formulaList', formulaList);
                     for (let key in formulaList[0]) {
                         let width = (key.indexOf("描述") != -1 || key == "文本" || key == "物料") ? "300px" :
                             "130px";
diff --git a/src/views/Need/components/FreezingColumnSetting.vue b/src/views/Need/components/FreezingColumnSetting.vue
new file mode 100644
index 0000000..7071ac4
--- /dev/null
+++ b/src/views/Need/components/FreezingColumnSetting.vue
@@ -0,0 +1,78 @@
+<template>
+    <lay-container>
+        <view class="layui-item33 color999" :style="'max-height:900px'">
+            <lay-row space="10">
+                <lay-col md="4" sm="12" xs="24" v-for="(item, index) in columns">
+                    <lay-checkbox-group v-model="checkedItem">
+                        <lay-checkbox :name="item.title" skin="primary" :value="item.key">
+                            {{ item.title }}
+                        </lay-checkbox>
+                    </lay-checkbox-group>
+                </lay-col>
+            </lay-row>
+        </view>
+        <view class="menuBtn">
+			<lay-button type="primary" @click="submitClick">确定</lay-button>
+			<lay-button @click="cancelClick">取消</lay-button>
+		</view>
+    </lay-container>
+</template>
+<script>
+    import {
+		ref
+	} from 'vue';
+    export default {
+        setup() {
+            const columnList = ref([]);
+            const checkedItem = ref([]);
+
+            return {
+                columnList,
+                checkedItem,
+            }
+        },
+        props: {
+            columns: {
+				type: Object,
+				default: () => [],
+			},
+            freezingColumns: {
+                type: Object,
+				default: () => [],
+            }
+        },
+        mounted() {
+            this.initPage();
+		},
+        methods: {
+            initPage() {
+                this.columnList = this.columns;
+                this.checkedItem = this.freezingColumns
+            },
+            cancelClick() {
+                this.$emit('cancelClick');
+            },
+            submitClick() {
+                this.$emit('cancelClick', this.checkedItem);
+            }
+        }
+    }
+</script>
+<style scoped>
+    .layui-item33 {
+		width: 90%;
+		padding-right: 30px;
+		margin: 30px auto 10px;
+		display: block;
+		overflow: auto;
+		position: relative;
+		clear: both;		
+	}
+
+    .menuBtn {
+		display: block;
+		text-align: center;
+		width: 96%;
+		margin: 20px auto;
+	}
+</style>
\ No newline at end of file

From e1eba856e9a11276e84b6b5d94e4ba5217b6520a Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Mon, 10 Apr 2023 19:15:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=97=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                        | 8 +-------
 src/views/Need/components/EditView.vue | 2 --
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 9279ed7..7e78672 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -10,9 +10,8 @@ declare module '@vue/runtime-core' {
     LayButton: typeof import('@layui/layui-vue')['LayButton']
     LayCard: typeof import('@layui/layui-vue')['LayCard']
     LayCheckbox: typeof import('@layui/layui-vue')['LayCheckbox']
+    LayCheckboxGroup: typeof import('@layui/layui-vue')['LayCheckboxGroup']
     LayCol: typeof import('@layui/layui-vue')['LayCol']
-    LayCollapse: typeof import('@layui/layui-vue')['LayCollapse']
-    LayCollapseItem: typeof import('@layui/layui-vue')['LayCollapseItem']
     LayColorPicker: typeof import('@layui/layui-vue')['LayColorPicker']
     LayConfigProvider: typeof import('@layui/layui-vue')['LayConfigProvider']
     LayContainer: typeof import('@layui/layui-vue')['LayContainer']
@@ -32,8 +31,6 @@ declare module '@vue/runtime-core' {
     LayLogo: typeof import('@layui/layui-vue')['LayLogo']
     LayMenu: typeof import('@layui/layui-vue')['LayMenu']
     LayMenuItem: typeof import('@layui/layui-vue')['LayMenuItem']
-    LayProgress: typeof import('@layui/layui-vue')['LayProgress']
-    LayQuote: typeof import('@layui/layui-vue')['LayQuote']
     LayRadio: typeof import('@layui/layui-vue')['LayRadio']
     LayRow: typeof import('@layui/layui-vue')['LayRow']
     LayScroll: typeof import('@layui/layui-vue')['LayScroll']
@@ -45,9 +42,6 @@ declare module '@vue/runtime-core' {
     LayTab: typeof import('@layui/layui-vue')['LayTab']
     LayTabItem: typeof import('@layui/layui-vue')['LayTabItem']
     LayTable: typeof import('@layui/layui-vue')['LayTable']
-    LayTextarea: typeof import('@layui/layui-vue')['LayTextarea']
-    LayTooltip: typeof import('@layui/layui-vue')['LayTooltip']
-    LayUpload: typeof import('@layui/layui-vue')['LayUpload']
     LightIcon: typeof import('./src/components/LightIcon.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index b7214b9..8349849 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -79,8 +79,6 @@
 	.isHidden{
 		display: none;
 	}
-	.isBomShow{
-	}
 	.isBomHidden{
 		display: none;
 	}