2023-11-23-2

src/component/Detail/DesignDetailAlter.vue

@@ -136,7 +136,7 @@
 											:key="index"
 											@click.stop="selectFileCategory(file, cate)"
 										>
-											{{ cate.label }}
+											{{ cate.value }}
 										</div>
 									</div>
 								</div>
@@ -280,26 +280,7 @@ export default defineComponent({
 		let searchPictureName = ref('')
 		//模型印花
 		let disignTypeList = [
-                {
-                    value: "Outwear",
-                    label: "Outwear",
-                },
-                {
-                    value: "Blouse",
-                    label: "Blouse",
-                },
-                {
-                    value: "Dress",
-                    label: "Dress",
-                },
-                {
-                    value: "Trousers",
-                    label: "Trousers",
-                },
-                {
-                    value: "Skirt",
-                    label: "Skirt",
-                },
+              
             ]
 		let total = ref(0)
         let pageSize = ref(10)
@@ -413,7 +394,7 @@ export default defineComponent({
                 let lable = "";
                 for (let item of this.disignTypeList) {
                     if (item.value === value) {
-                        lable = item.label;
+                        value = item.value;
                         break;
                     }
                 }
@@ -521,22 +502,23 @@ export default defineComponent({
 		},
 		getPosition(){
 			let params
-			if(this.workspace.sex == 'Female'){
+			if(this.workspace.sexEnum.name == 'Female'){
 				params = 'FemalePosition'
 			}else{
 				params = 'MalePosition'
 			}
 			Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv) => {
 				if (rv) {
-					let arr = []
-					rv.forEach((item) => {
-						let obj = {
-							value:item.name,
-							label:item.name,
-						}
-						arr.push(obj)						
-					});
-					this.disignTypeList = arr
+					// let arr = []
+					// rv.forEach((item) => {
+					// 	let obj = {
+					// 		value:item.value,
+					// 		name:item.name,
+					// 		key:item.key,
+					// 	}
+					// 	arr.push(obj)						
+					// });
+					this.disignTypeList = rv
 				}
 			})
 		},
@@ -612,7 +594,7 @@ export default defineComponent({
             document.addEventListener("click", this.hiddenFileCategory);
         },
 		 selectFileCategory(file, cate) {
-			file.level2Type = cate.value;
+			file.level2Type = cate.name;
 			 for (let item of this.clothesList) {
                 item.categoryShow = false;
             }

src/component/Detail/habit.vue

@@ -332,39 +332,22 @@ export default defineComponent({
 		async getSex(){
 			await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'Sex'}}).then((rv: any) => {
 				if (rv) {
-					let arr:any = []
-					rv.forEach((item:any) => {
-						let obj = {
-							value:item.value,
-							name:item.name,
-							key:item.key,
-						}
-						arr.push(obj)						
-					});
-					this.sex = arr
+					
+					this.sex = rv
 				}
 			})
 			this.getPosition('')
 		},
 		async getPosition(str:any){
 			let params
-			if(this.workspaceItem.sex == 'Female'){
+			if(this.workspaceItem.sexEnum.name == 'Female'){
 				params = 'FemalePosition'
 			}else{
 				params = 'MalePosition'
 			}
 			await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
 				if (rv) {
-					let arr:any = []
-					rv.forEach((item:any) => {
-						let obj = {
-							value:item.value,
-							name:item.name,
-							key:item.key,
-						}
-						arr.push(obj)						
-					});
-					this.singleTypeList = arr
+					this.singleTypeList = rv
 					if(str == 'sex'){
 						this.workspaceItem.position = this.singleTypeList[0].name
 						this.workspaceItem.positionEnum = this.singleTypeList[0]