commit by yzf

src/api/http.ts

@@ -14,6 +14,7 @@ const config = {
 //let userToken = "";
 // let userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJGSUQiOjIsIkZVc2VyIjoib2F0ZXN0MiIsIkZOYW1lIjoi5rWL6K-V5bel5Y6CIiwiRkV4cGlyZVRpbWUiOiIyMDIzLTAxLTE3IDIwOjIwOjA1In0.ZNN-fVE1JJ3tN82pM9DylqqMMpMUVLZWJKTBwz8M3bU"
 let userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJGSUQiOjIsIkZVc2VyIjoiSEIxMTAwMjgzIiwiRk5hbWUiOiLmnY7mtKrkvJ8iLCJGRXhwaXJlVGltZSI6IjIwMjMtMDctMjYgMjA6NTU6MDEifQ.qE281pbJFVWxkGqOiTjOeMZvmkN7lM9ObDS0D9bcbHA"
+//let userToken="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJGSUQiOjQsIkZVc2VyIjoiSGIxMjM0NTY3OCIsIkZOYW1lIjoib2F0ZXN0MiIsIkZFeHBpcmVUaW1lIjoiMjAyMy0wOC0yMyAxNzo1MDo0NyJ9.gAM_8SSeK-aaGqYiy2sulxVsvSNG2tfCa9dw3SdcF3o";
 
 //获取上传信息
 export function getUploadInfo(param: any) {

src/views/half/components/EditView.vue

@@ -355,6 +355,16 @@ export default {
 
 				item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2);
 
+				if(typeof(item["FTypeID1"])=="string")
+				{
+					item["FTypeID1"]=parseInt(item["FTypeID1"]);
+				}
+
+				if(typeof(item["FTypeID2"])=="string")
+				{
+					item["FTypeID2"]=parseInt(item["FTypeID2"]);
+				}
+
 				let fType1 = $this.typeList[0].find((t) => {
 					if (item.FTypeID1) {
 						return t.FID == item.FTypeID1