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

src/api/api/view.ts

@@ -27,7 +27,20 @@ export async function updateBatchById2(params) {
     return result;
 }
 
+<<<<<<< HEAD
 //获取物料视图
+=======
+//试验号变更-保存视图编辑的内容
+export async function updateBatchById3(params) {
+    let result = {};
+    await http.post('/api/View/UpdateBatchById3', params).then((data) => {
+        result = data;
+    });
+    return result;
+}
+
+//获取物理视图
+>>>>>>> 0bac140b03041610daed39483d29ac7c4eea0f17
 export async function GetMaterialInfoListByTeamId(params) {
     let result = {};
     await http.post('/api/View/GetMaterialInfoListByTeamId', params).then((data) => {

src/views/half/components/EditView.vue

@@ -1,6 +1,6 @@
 <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>
@@ -94,7 +94,8 @@ import {
 } from 'vue';
 import {
 	getListByTeamId,
-	updateBatchById2
+	updateBatchById2,
+	updateBatchById3
 } from "/src/api/api/view";
 import {
 	getBasicRoleList,
@@ -198,7 +199,6 @@ export default {
 			this.initPage(layer.load(2));
 		},
 		async initPage(idx) {
-			debugger
 			let _data = await getListByTeamId({
 				teamId: this.dataInfoObj.FTeamID,
 				viewType: this.dataInfoObj.FViewType
@@ -467,7 +467,7 @@ export default {
 				// 发送保存请求
 				debugger
 				console.log('updateObj', updateObj);
-				let _result = await updateBatchById2(updateObj);
+				let _result = await updateBatchById3(updateObj);
 				if (_result.Code === 200) {
 					await commonSave({
 						teamId: updateObj.FTeamID,

src/views/half/route.vue

@@ -53,8 +53,8 @@
 		<lay-layer :area="modelArea[2]" v-model="showEditBox[2]" :title="编辑物料">
 			<EditMateria v-if="showEditBox[2]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditMateria>
 		</lay-layer>
-		<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" :title="物料视图">
-			<EditView v-if="showEditBox[3]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditView>
+		<lay-layer :area="modelArea[1]" v-model="showEditBox[1]" :title="物料视图">
+			<EditView v-if="showEditBox[1]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditView>
 		</lay-layer>
 	</lay-container>
 </template>