Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

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/Need/components/EditView.vue

@@ -1,6 +1,6 @@
 <template>
 	<lay-container fluid="true" class="content-box">
-		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
+		<FormulaView v-if="isFormula" :teamId="dataInfoObj.FTeamID" @changeFormula="changeFormula" :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>
@@ -180,6 +180,7 @@ export default {
 		const idx = ref([]);
 		const materialInfoList=ref([]);
 		const dataRowsList=ref("");
+		const isFormula=ref(true);
 		return {
 			dataColumn,
 			dataList,
@@ -201,7 +202,8 @@ export default {
 			tmpDataColumn,
 			materialInfoList,
 			idx,
-			dataRowsList
+			dataRowsList,
+			isFormula
 		};
 	},
 	props: {
@@ -643,7 +645,12 @@ export default {
 		},
 		deepCopy(arr) {
 			return JSON.parse(JSON.stringify(arr))
+		},
+		changeFormula(val){
+			debugger
+			this.isFormula=val;
 		}
+
 	}
 }
 </script>

src/views/Need/components/FormulaView.vue

@@ -110,6 +110,11 @@
                 
                 // this.dataColumn = dataColumn;
 				this.dataList = dataList;
+
+                if(formulaList.length==0)
+                {
+                    this.$emit('changeFormula', false);
+                }
             }
         }
     }

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