修改冲突

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

@@ -598,94 +598,6 @@ const initLoadData = () => {
 
 function optionsValue3Get3(data: any, fieldName: string) {
   /* console.log(data)
-
-
-
-			Promise.all(getFieldRecordPromise).then(()=>{
-				console.log(gainAppPageInfoData)
-				let objMastesformStr =  JSON.stringify(objMastesform);
-				gainAppPageInfoData.data.appForm.mastesform = objMastesform
-				gainAppPageInfoData.data.appForm.mastesformjson = objMastesformStr
-
-
-				appInitData.value = gainAppPageInfoData.data
-				// console.log("获取初始化表单数据---!",appInitData.value)
-				mastesformjson.value = gainAppPageInfoData.data.appForm.mastesformjson
-				isFlow.value = gainAppPageInfoData.data.appForm.flowIsOpen
-				
-				versionId.value = gainAppPageInfoData.data.appForm.id.toString()
-				versionTitle.value = gainAppPageInfoData.data.appForm.name
-				
-				if(gainAppPageInfoData.data.page){
-					// console.log("data.data.mastesform", data.data)
-					stateForm.id=gainAppPageInfoData.data.appForm.version.toString()
-					stateForm.formId =gainAppPageInfoData.data.appForm.cfid.toString()
-					stateForm.versionId =gainAppPageInfoData.data.appForm.id.toString()
-					stateForm.formData = objMastesform
-					stateForm.formData.config.hideField = []//暂时的修复方法:接口返回的config中没有hideField属性,手动添加
-					stateForm.dict = string2json(gainAppPageInfoData.data.appForm.dict)
-					stateForm.formData.powerstr = string2json(gainAppPageInfoData.data.appForm.powerstr)
-					// console.log("data.data.mastesform", stateForm.formData)
-					
-					judgeSubmitCancel({"name":gainAppPageInfoData.data.appForm.mastesformjson})
-						.then((datajud:any) =>{
-							if(datajud.code == 0){
-								if (datajud.data == 3 || datajud.data == 4){
-									stateForm.formData.list.push(submitButton)
-								}
-							}
-						})
-				}
-			});
-
-
-
-		});
-
-
-
-		
-		
-	}
-	
-}
-
-//liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 start
-let qrCodeImgInside = ""
-const qrCodeInsideDialogFlag = ref(false)
-function showFillFormQrCode(){
-	//查看二维码展示弹窗图片,图片带有分组,app,表单名称,和二维码图片
-	//在此获取必要的参数并请求后台,获取二维码图片,当图片返回成功时,显示弹窗
-	//必要的参数为cfid
-	if(stateForm.formData.form.qrCodeFlag==true&&stateForm.formData.form.qrCodeInside==true){
-		getQrCodeImgInside().then(({ data }) => {
-			qrCodeImgInside = data
-			if(qrCodeInsideDialogFlag.value==false){
-				//console.log(qrCodeImgInside)
-				qrCodeInsideDialogFlag.value = true
-			}
-		})
-	}else{
-		alert("请先开启表单二维码功能")
-	}
-	
-	
-}
-
-function getQrCodeImgInside() {
-	return request({
-		url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
-		method: "post",
-		data: {
-		cfid: stateForm.formId,
-		},
-	});
-}
-//liwenxuan 20250206 在列表新增数据页增加扫码填单按钮显示填单二维码 end
-
-function optionsValue3Get3(data: any,fieldName: string){
-	/* console.log(data)
-
 	console.log(fileName)
 	console.log("appTableFlow","optionsValue3Get3") */
   for (let i = 0; i < stateForm.formData.list.length; i++) {
@@ -819,7 +731,6 @@ function optionsValue3Get3(data: any,fieldName: string){
 			:after-submit="afterSubmit"
 			add-url="addData"
 			@optionsValue3Get3="optionsValue3Get3"
-
 		/> -->
   </el-drawer>
 </template>
@@ -845,69 +756,5 @@ function optionsValue3Get3(data: any,fieldName: string){
       cursor: pointer;
     }
   }
-
-		/>
-	</el-drawer>
-
-	<el-dialog
-		v-model="qrCodeInsideDialogFlag"
-		class="glxxsztc"
-		top="150px"
-		:close-on-click-modal="false"
-		title="内部二维码"
-		:show-close="false"
-		style="margin-top: 70px"
-		width="25%"
-	>
-		<img :src="qrCodeImgInside" style="width: 80%;height: 50%;" />
-		<template #footer>
-		<div class="dialog-footer">
-			<el-button type="primary" @click="qrCodeInsideDialogFlag = false">
-			确定
-			</el-button>
-		</div>
-		</template>
-	</el-dialog>
-
-</template>
-<style  lang='scss' scoped>
-.common-layout{
-	height: calc(100vh - 55px);
-	padding: 0 15px;
-	.el-main{
-		height: calc(100vh - 55px);
-		padding:0;
-	}
-	.flowBox{
-		height: calc(100vh - 55px);
-		border-left: 1px solid #ccc;
-		padding: 0 15px;
-	}
-	.el-header{
-		padding:0 10px;
-		line-height:30px;
-		text-align:right;
-		font-size:20px;
-		i{
-			cursor:pointer;
-		}
-	}
-	.drawer-header {
-		display: flex;
-		align-items: center;
-		//padding: 12px;
-	}
-
-	.flex-grow {
-		/* 占据剩余的可用空间，将后面的元素推到右边 */
-		flex-grow: 1;
-	}
-
-	.drawer-close {
-		cursor: pointer;
-		//margin-left: 8px;
-	}
-
-
 }
 </style>