diff --git a/src/api/DesignForm/tableButton.ts b/src/api/DesignForm/tableButton.ts
index 7fb9524..1b67385 100644
--- a/src/api/DesignForm/tableButton.ts
+++ b/src/api/DesignForm/tableButton.ts
@@ -39,6 +39,13 @@ export const tableButtonList :attrButton[] = [
type: "danger",
size: "small",
icon: "delete"
+ },
+ {
+ label: "显示二维码",
+ key: "showQrCode",
+ type: "primary",
+ size: "small",
+ icon: "setUp"
}
]
//记录操作
diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts
index f1f890c..9a5d84a 100644
--- a/src/api/DesignForm/types.ts
+++ b/src/api/DesignForm/types.ts
@@ -98,6 +98,7 @@ export interface FileAttributeAll{
list:FileAttribute[];
}
+
//表单数据
export interface formData{
list: any[];
@@ -105,7 +106,10 @@ export interface formData{
size: any;
name:any,
formName:any,
- dataTitle:any
+ dataTitle:any,
+ qrCodeFlag: boolean,
+ qrCodeInside:boolean,
+ qrCodeOutside:boolean,
};
config: any;
events?:any;
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 73901ce..49c4743 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -220,11 +220,15 @@ const resetFields = (formEl: FormInstance | undefined) => {
@ 功能: 功能按钮动作
*/
const setUpClick = (val: string, id: string) => {
+ //alert(val.key)
// console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
if (val.key == "newAdd") {
drawerWith.value = container.value?.clientWidth;
openTaskDrawer.value = true;
- } else {
+ } else if(val.key == "showQrCode"){
+ //alert(val)
+ console.log(idList)
+ }else {
if (idList.value.length > 0) {
ElMessageBox.confirm("确认删除此数据项?删除后不可恢复！", "警告", {
confirmButtonText: "确定",
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index f3180a3..882d83e 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2123,14 +2123,42 @@ const transferDataSourceOptions = [
//const radio = ref(controlData.value.control.fit)
//liwenxuan20240313 lowcodeImage end
-
+//liwenxuan20250103 qrCode start
+let qrCodeImgInside = ""
+const qrCodeInsideDialogFlag = ref(false)
+function showQrCodeOutside(){
+ alert("暂不支持外部填单")
+}
+function showQrCodeInside(){
+ //查看二维码展示弹窗图片,图片带有分组,app,表单名称,和二维码图片
+ //在此获取必要的参数并请求后台,获取二维码图片,当图片返回成功时,显示弹窗
+ //必要的参数为cfid
+ getQrCodeImgInside().then(({ data }) => {
+ qrCodeImgInside = data
+ if(qrCodeInsideDialogFlag.value==false){
+ //console.log(qrCodeImgInside)
+ qrCodeInsideDialogFlag.value = true
+ }
+ })
+
+}
+function getQrCodeImgInside() {
+ return request({
+ url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
+ method: "post",
+ data: {
+ cfid: props.customerformid,
+ },
+ });
+}
+//liwenxuan20250103 qrCode end
//liwenxuan20240403 associatedForms start
import AssociatedFormsTinyace from "@/widget/associatedforms/associatedFormsTinyace.vue";
import AssociatedFormsTinyaceRange from "@/widget/associatedforms/associatedFormsTinyaceRange.vue";
import AssociatedFormsFillRole from "@/widget/associatedforms/associatedFormsFillRole.vue";
import AssociatedFormsChildFillRole from "@/widget/associatedforms/associatedFormsChildFillRole.vue";
-const treeDefaultProps = {
+const treeDefaultProps = {//
children: "children",
label: "label",
};
@@ -4571,6 +4599,32 @@ const radioChangeSet = (val: any) => {
/>
+
+
+
+
+
+
+ 查看内部二维码图片
+
+
+
+
+
+ 查看外部二维码图片
+
+
+
表单整体布局
@@ -4920,8 +4974,32 @@ const radioChangeSet = (val: any) => {
-
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
{
if (val.key == "newAdd") {
drawerWith.value = container.value?.clientWidth;
openTaskDrawer.value = true;
- } else {
+ } else if(val.key == "showQrCode"){
+ //alert(val)
+ console.log(idList)
+ }else {
if (idList.value.length > 0) {
ElMessageBox.confirm("确认删除此数据项?删除后不可恢复！", "警告", {
confirmButtonText: "确定",
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 8a7cf0c..2b69375 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -596,10 +596,10 @@ const formNameChanged = (param1: any) => {
//liwenxuan 关联选项设置 修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改 end
function optionsValue3Get3(data: any, fieldName: string) {
- console.log("pageForm", "optionsValue3Get3");
+ /* console.log("pageForm", "optionsValue3Get3");
console.log(state.value.formData.list);
console.log(data);
- console.log(fieldName);
+ console.log(fieldName); */
for (let i = 0; i < state.value.formData.list.length; i++) {
if (state.value.formData.list[i].name == fieldName) {
state.value.formData.list[i].options = [];
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index d2f9981..e1cbc8c 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -1665,7 +1665,7 @@ const dialogConfirm = (editVal: string) => {
- 功能按钮
+ 功能按钮