From ab705b4739605af23e126813148a2b9c1abfd4c4 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Tue, 11 Apr 2023 14:04:01 +0800
Subject: [PATCH 1/3] commit by yzf

---
 components.d.ts                               |  6 ++++
 .../Need/components/EditFSuccedaneum.vue      | 33 ++++++++++++-------
 src/views/Order/components/ShowMaterial.vue   |  5 +--
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 7e78672..166ff00 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -12,6 +12,8 @@ declare module '@vue/runtime-core' {
     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']
@@ -31,6 +33,8 @@ 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']
@@ -42,6 +46,8 @@ 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']
+    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/EditFSuccedaneum.vue b/src/views/Need/components/EditFSuccedaneum.vue
index cbce28a..f0ba9ff 100644
--- a/src/views/Need/components/EditFSuccedaneum.vue
+++ b/src/views/Need/components/EditFSuccedaneum.vue
@@ -12,14 +12,14 @@
 				</lay-input>
 			</template>
 			<template v-if="dataList == undefined || !dataList.FID" v-slot:operator="{ data }">
-				<lay-button size="xs" type="primary" @click="openConfirm2(data)">选择</lay-button>
+				<lay-button size="xs" type="primary" @click="changeVisible2(data)">选择</lay-button>
 			</template>
 		</lay-table>
 		<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog>
 	</lay-container>
 	<template>
-    <lay-button type="primary" @click="openConfirm2">询问框</lay-button>
-</template>
+		<lay-button type="primary" @click="openConfirm2">询问框</lay-button>
+	</template>
 </template>
 
 <style scoped>
@@ -177,10 +177,8 @@ export default {
 		const inputDescValue = ref("");
 		const visible2 = ref(false);
 
-		const openConfirm2 = function(data) {
-			layer.confirm("是否选择替代料", {btn: [{text:'选择'},{text:'不选择'}]})
-		}
-		 
+		
+
 		return {
 			dataColumn,
 			dataList,
@@ -194,8 +192,8 @@ export default {
 			inputDescValue,
 			isShow: false,
 			isBomShow: false,
-			visible2,
-			openConfirm2
+			visible2
+
 		};
 	},
 	props: {
@@ -235,9 +233,22 @@ export default {
 			}, 500);
 		},
 		changeVisible2(data) {
-			this.$emit('cancelClick', true, false);
-			this.$emit("getData", data);
+			let $this = this;
+			layer.confirm("是否选择替代料", {
+				btn: [{
+						text: '选择',
+						callback: function (id) {
+							layer.close(id);
+							$this.$emit('cancelClick', true, false);
+							$this.$emit("getData", data);
+						}
+					}, 
+					{
+						 text: '不选择' 
+					}]
+			})
 			
+
 		},
 		cancelClick(isRefresh) {
 			isRefresh = isRefresh == undefined ? false : isRefresh;
diff --git a/src/views/Order/components/ShowMaterial.vue b/src/views/Order/components/ShowMaterial.vue
index ef2aad7..a3d3d0b 100644
--- a/src/views/Order/components/ShowMaterial.vue
+++ b/src/views/Order/components/ShowMaterial.vue
@@ -143,7 +143,7 @@ export default {
 			let result2 = await getPageList({
 				FPageSize: 99,
 				FDataId: this.objInfoObj.FID
-			}, "View2") || {};
+			}, "View") || {};
 
 
 			
@@ -154,6 +154,7 @@ export default {
 			this.dataList = result2.Data.List.map(function(item){
                  item["FTypeName1"]=materialType.Data.List.find(m=>m.FID==item.FTypeID1)?materialType.Data.List.find(m=>m.FID==item.FTypeID1).FName:"";
 				 item["FTypeName2"]=materialType.Data.List.find(m=>m.FID==item.FTypeID2)?materialType.Data.List.find(m=>m.FID==item.FTypeID2).FName:"";
+				 debugger
 				 item.FType=materialType.Data.List.find(m=>m.FID==item.FType)?materialType.Data.List.find(m=>m.FID==item.FType).FName:"";
 				 item["FSAPCode"]=item.FCode;
 				 item["FSAPDescription"]=item.FName;
@@ -166,7 +167,7 @@ export default {
 				 item["FCraftExplain"]=item.FCraftDesc;
 				 return item;
 			}) || [];
-			debugger
+			
 
 			
 		},

From 81d0bd6931ec9e2cdc088808a90935cdab89ffa3 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Tue, 11 Apr 2023 14:07:28 +0800
Subject: [PATCH 2/3] commit by yzf

---
 src/views/Order/components/ShowMaterial.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Order/components/ShowMaterial.vue b/src/views/Order/components/ShowMaterial.vue
index 5243649..eb96441 100644
--- a/src/views/Order/components/ShowMaterial.vue
+++ b/src/views/Order/components/ShowMaterial.vue
@@ -166,6 +166,7 @@ export default {
 				 item["FBaseWeightUnit"]=item.FBaseUnit;
 				 item["FCraftExplain"]=item.FCraftDesc;
 				 return item;
+				 
 			}) || [];
 		},
 		cancelClick() {

From 81f236087fa1a2c20fd320d782b33d7393a1ea23 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Tue, 11 Apr 2023 21:50:06 +0800
Subject: [PATCH 3/3] commit by yzf

---
 src/styles/admin.css                        |  13 +
 src/views/Need/components/EditView.vue      | 736 +++++++++++---------
 src/views/Order/components/ShowMaterial.vue |   3 +-
 yarn.lock                                   |   6 +-
 4 files changed, 412 insertions(+), 346 deletions(-)

diff --git a/src/styles/admin.css b/src/styles/admin.css
index 0a55669..197763e 100644
--- a/src/styles/admin.css
+++ b/src/styles/admin.css
@@ -121,3 +121,16 @@
 .layui-table-main td{
   white-space: pre-line!important;
 }
+
+.one{
+	background: #00B0F0 !important;;
+}
+.twe{
+	background: #00FF00!important;
+}
+.three{
+	background:#FF6464!important;
+}
+.four{
+	background: #FF64FF!important;
+}
diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 63e2761..34d6567 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -1,13 +1,14 @@
 <template>
 	<lay-container fluid="true" class="content-box">
-		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>		
+		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
 		<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
-			<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns" :freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
+			<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
+				: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-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-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true">
 					<template #prepend>半成品编号：</template>
@@ -15,23 +16,24 @@
 				<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 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']"
-							@change="_changeType(data,1)" :showEmpty="false">
-					<lay-select-option v-for="(tIdv,tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID"
-									   :label="tIdv.FName"></lay-select-option>
+				<lay-select v-if="item.key == 'FTypeID1'" size="sm" v-model="data['FTypeID1']"
+					@change="_changeType(data, 1)" :showEmpty="false">
+					<lay-select-option v-for="(tIdv, tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID"
+						:label="tIdv.FName"></lay-select-option>
 				</lay-select>
-				<lay-select v-else-if="item.key=='FTypeID2'" size="sm" v-model="data['FTypeID2']"
-							@change="_changeType(data,2)" :showEmpty="false">
-					<lay-select-option v-show="data.FTypeID1==tIdv.FParentID" v-for="(tIdv,tIdx) in typeList[1]"
-									   :key="tIdx" :value="tIdv.FID" :label="tIdv.FName"></lay-select-option>
+				<lay-select v-else-if="item.key == 'FTypeID2'" size="sm" v-model="data['FTypeID2']"
+					@change="_changeType(data, 2)" :showEmpty="false">
+					<lay-select-option v-show="data.FTypeID1 == tIdv.FParentID" v-for="(tIdv, tIdx) in typeList[1]"
+						:key="tIdx" :value="tIdv.FID" :label="tIdv.FName"></lay-select-option>
 				</lay-select>
 				<lay-select v-else-if="item.selectType" size="sm" v-model="data[item.key]" :showEmpty="false">
-					<lay-select-option v-for="(tIdv,tIdx) in selectDataMap['FType'+item.selectTypeId]" :key="tIdx"
-									   :value="tIdv.FValue" :label="tIdv.FName"></lay-select-option>
+					<lay-select-option v-for="(tIdv, tIdx) in selectDataMap['FType' + item.selectTypeId]" :key="tIdx"
+						:value="tIdv.FValue" :label="tIdv.FName"></lay-select-option>
 				</lay-select>
 				<lay-input v-else-if="!item.dataType" size="sm" v-model="data[item.key]"></lay-input>
 			</template>
@@ -41,362 +43,412 @@
 </template>
 
 <style scoped>
-	.content-box {
-		margin: 30px 10px;
-		display: block;
-		position: relative;
-		clear: both;
-		float: none;
-		min-height: 740px;
-	}
+.content-box {
+	margin: 30px 10px;
+	display: block;
+	position: relative;
+	clear: both;
+	float: none;
+	min-height: 740px;
+}
 
-	.row-select td {
-		overflow: inherit;
-	}
 
-	.layui-select {
-		width: 100%;
-	}
+.row-select td {
+	overflow: inherit;
+}
 
-	.edit {
-		color: green;
-	}
+.layui-select {
+	width: 100%;
+}
 
-	:deep(.edit-item .layui-input) {
-		border-color: #5FB878 !important;
-	}
+.edit {
+	color: green;
+}
 
-	:deep(.edit-item .layui-input:hover) {
-		border-color: #009688 !important;
-		color: #009688;
-	}
-	.isShow{
-		width: 370px;
-		height:30px;
-		border: none;
-	}
-	.isHidden{
-		display: none;
-	}
-	.isBomHidden{
-		display: none;
-	}
+:deep(.edit-item .layui-input) {
+	border-color: #5FB878 !important;
+}
+
+:deep(.edit-item .layui-input:hover) {
+	border-color: #009688 !important;
+	color: #009688;
+}
+
+.isShow {
+	width: 370px;
+	height: 30px;
+	border: none;
+}
+
+.isHidden {
+	display: none;
+}
+
+.isBomHidden {
+	display: none;
+}
 </style>
 <script>
-	import {
-		ref
-	} from 'vue';
-	import {
-		getListByTeamId,
-		updateBatchById2
-	} from "/src/api/api/view";
-	import {
-		getBasicRoleList
-	} from "/src/api/api/user";
-	import {
-		getDataCode,
-		commonSave
-	} from "/src/api/api/common";
+import {
+	ref
+} from 'vue';
+import {
+	getListByTeamId,
+	updateBatchById2
+} from "/src/api/api/view";
+import {
+	getBasicRoleList
+} from "/src/api/api/user";
+import {
+	getDataCode,
+	commonSave
+} from "/src/api/api/common";
 
-	import {
-		getInfoData,
-		changeInfoData
-	} from "/src/api/api/materialType";
-	import OperateLog from "./OperateLog.vue";
-	import FormulaView from "./FormulaView.vue";
-	import FreezingColumnSetting from './FreezingColumnSetting.vue';
+import {
+	getInfoData,
+	changeInfoData
+} 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,
-			FreezingColumnSetting
+export default {
+	components: {
+		OperateLog,
+		FormulaView,
+		FreezingColumnSetting
+	},
+	setup() {
+		const dataColumn = ref([]);
+		const dataList = ref([]);
+		const editColumn = ref([]);
+		const selectDataMap = ref(null);
+		const typeList = ref([
+			[],
+			[]
+		]);
+		const userPower = ref([
+			[],
+			[]
+		]);
+		const cellStyle = function (row, column, rowIndex, columnIndex) {
+			let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : ""
+			return back;
+		}
+		const cellClassName = function (row, column, rowIndex, columnIndex) {
+			return column.cellClass || "";
+		}
+		const inputCodeValue = ref("");
+		const inputDescValue = ref("");
+		const visible2 = ref(false)
+		const changeVisible2 = function () {
+			visible2.value = !visible2.value
+		};
+		const showFreezingColumnSettingBox = ref(false);
+		const freezingColumnSetting = ref([]);
+		const originalColumns = ref([]);
+		const tmpDataColumn = ref([]);
+		return {
+			dataColumn,
+			dataList,
+			editColumn,
+			selectDataMap,
+			typeList,
+			userPower,
+			cellStyle,
+			cellClassName,
+			inputCodeValue,
+			inputDescValue,
+			isShow: false,
+			isBomShow: false,
+			visible2,
+			changeVisible2,
+			showFreezingColumnSettingBox,
+			freezingColumnSetting,
+			originalColumns,
+			tmpDataColumn
+		};
+	},
+	props: {
+		dataInfoObj: {
+			type: Object,
+			default: () => { },
 		},
-		setup() {
-			const dataColumn = ref([]);
-			const dataList = ref([]);
-			const editColumn = ref([]);
-			const selectDataMap = ref(null);
-			const typeList = ref([
-				[],
-				[]
-			]);
-			const userPower = ref([
-				[],
-				[]
-			]);
-			const cellStyle = function(row, column, rowIndex, columnIndex) {
-				let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246) !important;" : ""
-				return back;
-			}
-			const cellClassName = function(row, column, rowIndex, columnIndex) {
-				return column.cellClass || "";
+		viewDataList: {
+			type: Object,
+			default: () => [],
+		}
+	},
+	mounted() {
+		this.getUserPower();
+	},
+	methods: {
+		async getUserPower() {
+			if (this.dataInfoObj.FCanEdit != 2) {
+				this.userPower[0] = (await getBasicRoleList({
+					FRoleType: 40,
+					FViewType: this.dataInfoObj.FViewType
+				}) || []).map(it => parseInt(it.F2))
+				this.userPower[1] = (await getBasicRoleList({
+					FRoleType: 44,
+					FViewType: this.dataInfoObj.FViewType
+				}) || []).map(it => parseInt(it.F2))
 			}
-			const inputCodeValue = ref("");
-			const inputDescValue = ref("");
-			const visible2 = ref(false)
-			const changeVisible2 = function() {
-				visible2.value = !visible2.value
-			};
-			const showFreezingColumnSettingBox = ref(false);
-			const freezingColumnSetting = ref([]);
-			const originalColumns = ref([]);
-			const tmpDataColumn = ref([]);
-			return {
-				dataColumn,
-				dataList,
-				editColumn,
-				selectDataMap,
-				typeList,
-				userPower,
-				cellStyle,
-				cellClassName,
-				inputCodeValue,
-				inputDescValue,
-				isShow: false,
-				isBomShow :false,
-				visible2,
-				changeVisible2,
-				showFreezingColumnSettingBox,
-				freezingColumnSetting,
-				originalColumns,
-				tmpDataColumn
-			};
+			this.initPage(layer.load(2));
 		},
-		props: {
-			dataInfoObj: {
-				type: Object,
-				default: () => {},
-			},
-			viewDataList: {
-				type: Object,
-				default: () => [],
+		async initPage(idx) {
+			let _data = await getListByTeamId({
+				teamId: this.dataInfoObj.FTeamID,
+				viewType: this.dataInfoObj.FViewType
+			});
+			if (this.dataInfoObj.FViewType == 1) {
+				this.inputCodeValue = _data.rows[0].HalfCode;
+				this.inputDescValue = _data.rows[0].HalfDesc;
+				this.isShow = true;
+			} else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) {
+				this.isBomShow = true;
 			}
-		},
-		mounted() {
-			this.getUserPower();
-		},
-		methods: {
-			async getUserPower() {
-				if (this.dataInfoObj.FCanEdit != 2) {
-					this.userPower[0] = (await getBasicRoleList({
-						FRoleType: 40,
-						FViewType: this.dataInfoObj.FViewType
-					}) || []).map(it => parseInt(it.F2))
-					this.userPower[1] = (await getBasicRoleList({
-						FRoleType: 44,
-						FViewType: this.dataInfoObj.FViewType
-					}) || []).map(it => parseInt(it.F2))
-				}
-				this.initPage(layer.load(2));
-			},
-			async initPage(idx) {
-				let _data = await getListByTeamId({
-					teamId: this.dataInfoObj.FTeamID,
-					viewType: this.dataInfoObj.FViewType
-				});
 
-				if(this.dataInfoObj.FViewType == 1){
-					this.inputCodeValue = _data.rows[0].HalfCode;
-					this.inputDescValue = _data.rows[0].HalfDesc;
-					this.isShow = true;
-				}else if(this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4){
-					this.isBomShow = true;
-				}
+			this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || [];
+			this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
+			let dataColumn = _data.columns || [];
+			let editColumn = dataColumn.filter(it => {
 
-				this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || [];
-				this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
-				let dataColumn = _data.columns || [];
-				let editColumn = dataColumn.filter(it => {
-					let b = false;
-					if (this.dataInfoObj.FCanEdit != 2) {
-						if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
-						else b = this.userPower[0].indexOf(it.id) >= 0;
-						if (b) {
-							it.customSlot = it.key;
-							it.cellClass = "edit-item"
-						}
-					}
-					return b;
-				});
-				if (editColumn.length > 0) {
-					if (this.selectDataMap == null) {
-						let dataTypeIds = editColumn.filter(it => {
-							it.selectType = it.dataType.startsWith('select:');
-							if (it.selectType) {
-								it.selectTypeId = it.dataType.substring(7)
-							}
-							return it.selectType;
-						}).map(it => it.selectTypeId);
-						if (dataTypeIds.length > 0) {
-							this.selectDataMap = await getDataCode({
-								FType: dataTypeIds.join(",")
-							});
-						}
+				let b = false;
+				if (this.dataInfoObj.FCanEdit != 2) {
+					if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
+					else b = this.userPower[0].indexOf(it.id) >= 0;
+					if (b) {
+						it.customSlot = it.key;
+						it.cellClass = "edit-item"
 					}
-					// //修改项移到前面
-					// if (this.dataInfoObj.FCanEdit != 2) {
-					// 	let tempColumn1 = dataColumn.filter(s => s.customSlot) || [];
-					// 	let tempColumn2 = dataColumn.filter(s => s.customSlot == undefined) || [];
-					// 	dataColumn = [...tempColumn1, ...tempColumn2];
-					// }
 				}
-				let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
-				_data.rows.forEach((item) => {
-					let k3Code = item.FBaseMaterialDesc;
-					if(k3Code.indexOf("@") > 0){
-						item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
-						item.FK3Name = k3Code.substr(k3Code.indexOf("@") +1);
-					}else{
-						item.FK3Code = "";
-						item.FK3Name = "";
-					}
-					if(k3Code.lastIndexOf(".") > 0){
-						item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".")+1);
-					}else{
-						item.FK3ShortCode = "";
-					}
-					let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
-					if (info != null) {
-						col7.forEach((col) => {
-							item[col.key] = info[col.key] || item[col.key] || "";
+				return b;
+			});
+			if (editColumn.length > 0) {
+				if (this.selectDataMap == null) {
+					let dataTypeIds = editColumn.filter(it => {
+						it.selectType = it.dataType.startsWith('select:');
+						if (it.selectType) {
+							it.selectTypeId = it.dataType.substring(7)
+						}
+						return it.selectType;
+					}).map(it => it.selectTypeId);
+					if (dataTypeIds.length > 0) {
+						this.selectDataMap = await getDataCode({
+							FType: dataTypeIds.join(",")
 						});
 					}
-					item.FTypeID1 = (item.FTypeID1 == 0 || item.FTypeID1 == -1) ? "" : item.FTypeID1;
-					item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2;
-				});
-				let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
-				localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
-				this.editColumn = editColumn;
-				this.dataList = _data.rows;
-				this.dataColumn = dataColumn;
-				this.originalColumns = this.deepCopy(dataColumn);
+				}
+				// //修改项移到前面
+				// if (this.dataInfoObj.FCanEdit != 2) {
+				// 	let tempColumn1 = dataColumn.filter(s => s.customSlot) || [];
+				// 	let tempColumn2 = dataColumn.filter(s => s.customSlot == undefined) || [];
+				// 	dataColumn = [...tempColumn1, ...tempColumn2];
+				// }
+			}
+			let columnsList = [];
+			let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
+			debugger
 
-				setTimeout(function() {
-					layer.close(idx);
-				}, 500);
-			},
-			cancelClick(isRefresh) {
-				isRefresh = isRefresh == undefined ? false : isRefresh;
-				this.$emit('cancelClick', isRefresh);
-			},
-			async _changeType(data, type) {
-				if (type == 1) {
-					data.FTypeID2 = -1;
-				} else {
-					if (data.FTypeID2) {
-						let result = await getInfoData({
-							"FDataID": data.FTypeID2,
-							"FType": 1
-						}) || null;
-						if (result != null && result.FID) {
-							let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
-							col7.forEach((item) => {
-								if (item.table == "TFS_MaterialInfo") {
-									data[item.key] = result[item.key] || data[item.key] || "";
-								}
-							});
+			_data.rows.forEach((item, i) => {
+
+				columnsList = _data.columns.map(function (items) {
+					let str = _data.infos[i][items.key + "Type"];
+					if (typeof (str) != "undefined") {
+						switch (str) {
+							case "1":
+								return items.cellClass = items.cellClass + " one";
+							case "2":
+								return items.cellClass = items.cellClass + " twe";
+							case "3":
+								return items.cellClass = items.cellClass + " three";
+							case "4":
+								return items.cellClass = items.cellClass + " four";
 						}
 					}
+
+					return items;
+				})
+				let k3Code = item.FBaseMaterialDesc;
+				if (k3Code.indexOf("@") > 0) {
+					item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
+					item.FK3Name = k3Code.substr(k3Code.indexOf("@") + 1);
+				} else {
+					item.FK3Code = "";
+					item.FK3Name = "";
 				}
-			},
-			async saveBatch() {
-				let idx = layer.load(2);
-				let updateObj = {
-					LogList: [],
-					FTeamID: this.dataInfoObj['FTeamID'],
-					FViewType: this.dataInfoObj.FViewType
-				};
-				let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
-				let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
-				this.dataList.forEach((row, index) => {
-					let cache = cacheDataList[index];
-					let dataObj = {};
-					for (let col of this.editColumn) {
-						let valTemp = row[col.key];
-						if (valTemp != cache[col.key]) {
-							if (!dataObj[col.table]) {
-								dataObj[col.table] = {};
-								dataObj[col.table].FMaterialID = row["FMaterialID"];
+				if (k3Code.lastIndexOf(".") > 0) {
+					item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".") + 1);
+				} else {
+					item.FK3ShortCode = "";
+				}
+				let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
+				if (info != null) {
+					col7.forEach((col) => {
+						item[col.key] = info[col.key] || item[col.key] || "";
+					});
+				}
+				item.FTypeID1 = (item.FTypeID1 == 0 || item.FTypeID1 == -1) ? "" : item.FTypeID1;
+				item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2;
+			});
+			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
+			localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
+
+
+
+			this.editColumn = editColumn;
+			this.dataList = _data.rows;
+			this.dataColumn = dataColumn;
+			this.originalColumns = this.deepCopy(dataColumn);
+			debugger
+
+			setTimeout(function () {
+				layer.close(idx);
+			}, 500);
+		},
+		cancelClick(isRefresh) {
+			isRefresh = isRefresh == undefined ? false : isRefresh;
+			this.$emit('cancelClick', isRefresh);
+		},
+		async _changeType(data, type) {
+			if (type == 1) {
+				data.FTypeID2 = -1;
+			} else {
+				if (data.FTypeID2) {
+					let result = await getInfoData({
+						"FDataID": data.FTypeID2,
+						"FType": 1
+					}) || null;
+
+					if (result != null && result.FID) {
+						let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
+						col7.forEach((item) => {
+							if (item.table == "TFS_MaterialInfo") {
+								data[item.key] = result[item.key] || data[item.key] || "";
 							}
-							dataObj[col.table][col.key] = valTemp;
-							if (col.key == "FTypeID1" || col.key == "FTypeID2") {
-								let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || [];
-								let temp = temps.find(s => s.FID == valTemp) || null;
-								valTemp = temp == null ? "" : temp.FName;
+						});
+
+						this.dataColumn.map(function (item) {
+							debugger
+							let str = result[item.key + "Type"];
+
+							if (typeof (str) != "undefined") {
+								switch (str) {
+									case "1":
+										return item.cellClass = item.cellClass.split(" ")[0] + " one";
+									case "2":
+										return item.cellClass = item.cellClass.split(" ")[0] + " twe";
+									case "3":
+										return item.cellClass = item.cellClass.split(" ")[0] + " three";
+									case "4":
+										return item.cellClass = item.cellClass.split(" ")[0] + " four";
+								}
 							}
-							updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp));
-						}
-					}
-					for (let key in dataObj) {
-						if (!updateObj[key]) updateObj[key] = [];
-						updateObj[key].push(dataObj[key]);
-					}
-				});
-				let updateLog = updateObj.LogList.join("、");
-				if (updateLog != "") {
-					delete updateObj.LogList
-					// 发送保存请求
-					let _result = await updateBatchById2(updateObj);
-					if (_result.Code === 200) {
-						await commonSave({
-							teamId: updateObj.FTeamID,
-							type: this.dataInfoObj['FType'],
-							desc: updateLog
-						}, "OperateLog");
-						let $this = this;
-						//$this.initPage();
-						localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
-						setTimeout(function() {
-							layer.close(idx);
-							layer.msg('保存成功');
-							$this.$emit('cancelClick', true, true);
-							$this.$refs.OperateLog._getPageList();
-						}, 500);
+
+							return item;
+						})
 					}
-				} else {
-					layer.close(idx);
-					layer.msg('您没有做任何更改')
 				}
-			},
-			_clickFreezingColumnSetting() {
-				this.dataColumn = ref([]);
-				this.showFreezingColumnSettingBox = true;
-			},
-			setFreezingColumns() {
-				this.tmpDataColumn = this.deepCopy(this.originalColumns);
-				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 fc = this.tmpDataColumn.splice(colIndex, 1)[0];
-							if (fc) {
-								fc.fixed = "left";
-								freezingColumns.push(fc);
-							}
+			}
+		},
+		async saveBatch() {
+			let idx = layer.load(2);
+			let updateObj = {
+				LogList: [],
+				FTeamID: this.dataInfoObj['FTeamID'],
+				FViewType: this.dataInfoObj.FViewType
+			};
+			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
+			let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
+			this.dataList.forEach((row, index) => {
+				let cache = cacheDataList[index];
+				let dataObj = {};
+				for (let col of this.editColumn) {
+					let valTemp = row[col.key];
+					if (valTemp != cache[col.key]) {
+						if (!dataObj[col.table]) {
+							dataObj[col.table] = {};
+							dataObj[col.table].FMaterialID = row["FMaterialID"];
 						}
-					})
-
-					this.dataColumn = freezingColumns.concat(this.tmpDataColumn);
-				} else {
-					this.dataColumn = this.tmpDataColumn;
+						dataObj[col.table][col.key] = valTemp;
+						if (col.key == "FTypeID1" || col.key == "FTypeID2") {
+							let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || [];
+							let temp = temps.find(s => s.FID == valTemp) || null;
+							valTemp = temp == null ? "" : temp.FName;
+						}
+						updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp));
+					}
 				}
-			},
-			setFreezingColumnsSetting(fcs) {
-				this.freezingColumnSetting = fcs;
-				if (fcs && fcs.length > 0) {
-				} else {
-					this.dataColumn = this.originalColumns;
+				for (let key in dataObj) {
+					if (!updateObj[key]) updateObj[key] = [];
+					updateObj[key].push(dataObj[key]);
+				}
+			});
+			let updateLog = updateObj.LogList.join("、");
+			if (updateLog != "") {
+				delete updateObj.LogList
+				// 发送保存请求
+				let _result = await updateBatchById2(updateObj);
+				if (_result.Code === 200) {
+					await commonSave({
+						teamId: updateObj.FTeamID,
+						type: this.dataInfoObj['FType'],
+						desc: updateLog
+					}, "OperateLog");
+					let $this = this;
+					//$this.initPage();
+					localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
+					setTimeout(function () {
+						layer.close(idx);
+						layer.msg('保存成功');
+						$this.$emit('cancelClick', true, true);
+						$this.$refs.OperateLog._getPageList();
+					}, 500);
 				}
-				this.showFreezingColumnSettingBox = false;
-			},
-			closeFreezingSetting() {
-				this.setFreezingColumns();
-			},
-			deepCopy(arr) {
-				return JSON.parse(JSON.stringify(arr))
+			} else {
+				layer.close(idx);
+				layer.msg('您没有做任何更改')
 			}
+		},
+		_clickFreezingColumnSetting() {
+			this.dataColumn = ref([]);
+			this.showFreezingColumnSettingBox = true;
+		},
+		setFreezingColumns() {
+			this.tmpDataColumn = this.deepCopy(this.originalColumns);
+			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 fc = this.tmpDataColumn.splice(colIndex, 1)[0];
+						if (fc) {
+							fc.fixed = "left";
+							freezingColumns.push(fc);
+						}
+					}
+				})
+
+				this.dataColumn = freezingColumns.concat(this.tmpDataColumn);
+			} else {
+				this.dataColumn = this.tmpDataColumn;
+			}
+		},
+		setFreezingColumnsSetting(fcs) {
+			this.freezingColumnSetting = fcs;
+			if (fcs && fcs.length > 0) {
+			} else {
+				this.dataColumn = this.originalColumns;
+			}
+			this.showFreezingColumnSettingBox = false;
+		},
+		closeFreezingSetting() {
+			this.setFreezingColumns();
+		},
+		deepCopy(arr) {
+			return JSON.parse(JSON.stringify(arr))
 		}
 	}
+}
 </script>
diff --git a/src/views/Order/components/ShowMaterial.vue b/src/views/Order/components/ShowMaterial.vue
index eb96441..e157e2c 100644
--- a/src/views/Order/components/ShowMaterial.vue
+++ b/src/views/Order/components/ShowMaterial.vue
@@ -139,6 +139,7 @@ export default {
 					});
 				}
 			});
+			debugger
 			this.dataColumn = dataColumn;
 			let result2 = await getPageList({
 				FPageSize: 99,
@@ -166,7 +167,7 @@ export default {
 				 item["FBaseWeightUnit"]=item.FBaseUnit;
 				 item["FCraftExplain"]=item.FCraftDesc;
 				 return item;
-				 
+
 			}) || [];
 		},
 		cancelClick() {
diff --git a/yarn.lock b/yarn.lock
index 593f55e..eb9b99f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1293,10 +1293,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-esbuild-windows-64@0.14.39:
+esbuild-windows-32@0.14.39:
   version "0.14.39"
-  resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz"
-  integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==
+  resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz"
+  integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==
 
 esbuild@^0.14.27, esbuild@>=0.13:
   version "0.14.39"