修改冲突

src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue

@@ -596,10 +596,9 @@ const initLoadData = () => {
   }
 };
 
-<<<<<<< HEAD
 function optionsValue3Get3(data: any, fieldName: string) {
   /* console.log(data)
-=======
+
 
 
 			Promise.all(getFieldRecordPromise).then(()=>{
@@ -686,7 +685,7 @@ function getQrCodeImgInside() {
 
 function optionsValue3Get3(data: any,fieldName: string){
 	/* console.log(data)
->>>>>>> lwx_v17
+
 	console.log(fileName)
 	console.log("appTableFlow","optionsValue3Get3") */
   for (let i = 0; i < stateForm.formData.list.length; i++) {
@@ -700,7 +699,6 @@ function optionsValue3Get3(data: any,fieldName: string){
 }
 </script>
 <template>
-<<<<<<< HEAD
   <el-drawer
     v-model="drawerOpenOrClose"
     v-loading="loadingData"
@@ -767,22 +765,30 @@ function optionsValue3Get3(data: any,fieldName: string){
       />
     </div>
     <!-- <AppFormPage
-=======
+
 	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
 
 		<!-- liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 start -->
-		<!-- 自定义抽屉头部 -->
+    <!-- 自定义抽屉头部 -->
-		<template #header>
+    <template #header>
-			<div v-if="stateForm.formData.form.qrCodeFlag==true&&stateForm.formData.form.qrCodeInside==true" class="drawer-header" >
+      <div
-				{{versiontitle}}
+        v-if="
-				<div class="flex-grow"></div>
+          stateForm.formData.form.qrCodeFlag == true &&
-				<el-button size="small" style="margin-right: 15px" @click="showFillFormQrCode" >扫码填单</el-button>
+          stateForm.formData.form.qrCodeInside == true
-			</div>
+        "
-		</template>
+        class="drawer-header"
-		<!-- liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 end -->
+      >
+        {{ versiontitle }}
+        <div class="flex-grow"></div>
+        <el-button size="small" style="margin-right: 15px" @click="showFillFormQrCode"
+          >扫码填单</el-button
+        >
+      </div>
+    </template>
+    <!-- liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 end -->
+
+    <!-- <AppFormPage
 
-		<!-- <AppFormPage
->>>>>>> lwx_v17
 						
 			ref="formEl"
 			:number="props.pickAppMenu.id"
@@ -813,7 +819,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 			:after-submit="afterSubmit"
 			add-url="addData"
 			@optionsValue3Get3="optionsValue3Get3"
-<<<<<<< HEAD
+
 		/> -->
   </el-drawer>
 </template>
@@ -839,7 +845,7 @@ function optionsValue3Get3(data: any,fieldName: string){
       cursor: pointer;
     }
   }
-=======
+
 		/>
 	</el-drawer>
 
@@ -862,7 +868,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 		</div>
 		</template>
 	</el-dialog>
-	
+
 </template>
 <style  lang='scss' scoped>
 .common-layout{
@@ -901,7 +907,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 		cursor: pointer;
 		//margin-left: 8px;
 	}
-	
+
->>>>>>> lwx_v17
+
 }
 </style>