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] 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
+			
 
 			
 		},