Merge branch 'lwx_16'

11 months ago · 2e00ee9a5f
8 changed files with 109 additions and 13 deletions
--- 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"
 	}
 ]
 //记录操作
--- 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;
--- 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: "确定",
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@ -2153,14 +2153,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",
 };
@ -4786,6 +4814,32 @@ const updataBase = (val: any) => {
            />
          </el-form-item>

+          <el-form-item class="form_cont"  label="二维码">
+            <el-switch v-model="formData.qrCodeFlag" />
+          </el-form-item>
+          <el-form-item v-if="formData.qrCodeFlag" class="form_cont"  label="内部二维码">
+            <el-switch v-model="formData.qrCodeInside" />
+            <el-button
+              v-if="formData.qrCodeInside"
+              type="primary"
+              text
+              @click="showQrCodeInside"
+            >
+              查看内部二维码图片
+            </el-button>
+          </el-form-item>
+          <el-form-item  v-if="formData.qrCodeFlag" class="form_cont"  label="外部二维码">
+            <el-switch v-model="formData.qrCodeOutside" />
+            <el-button
+              v-if="formData.qrCodeOutside"
+              type="primary"
+              text
+              @click="showQrCodeOutside"
+            >
+              查看外部二维码图片
+            </el-button>
+          </el-form-item>
+
          <el-divider content-position="left">表单整体布局</el-divider>
          <el-form-item label="组件尺寸" class="form_cont">
            <el-radio-group v-model="formData.size">
@ -5135,8 +5189,32 @@ const updataBase = (val: any) => {
  </el-dialog>
  <!-- 穿梭框设置弹窗 liwenxuan 20240217 end -->

-  <!-- 关联表单设置弹窗 liwenxuan 20240402 start -->

+  <!-- 二维码展示弹窗 liwenxuan 20250103 start -->
+
+  <el-dialog
+    v-model="qrCodeInsideDialogFlag"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    title="内部二维码"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <img :src="qrCodeImgInside" style="width: 50%;height: 50%;" />
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="qrCodeInsideDialogFlag = false">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 二维码展示弹窗 liwenxuan 20250103 end -->
+  <!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
+  <!--  -->
  <el-dialog
    v-model="associatedFormsChooseDialogFlag"
    class="glxxsztc"
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@ -218,7 +218,10 @@ const setUpClick = (val: string, id: string) => {
  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: "确定",
--- 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 = [];
--- 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) => {
            </el-collapse-item>
          </el-collapse>
        </div>
-        <el-divider content-position="left">功能按钮</el-divider>
+        <el-divider content-position="left">功能按钮</el-divider><!-- liwenxuan 添加扫码功能 -->
        <div class="form_tabs">
          <el-table
            ref="tableAttrBut"
--- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
@ -598,7 +598,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 </script>
 <template>
 	<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" >
-		<AppFormPage
+		<!-- <AppFormPage
 						
 			ref="formEl"
 			:number="props.pickAppMenu.id"
@ -613,8 +613,8 @@ function optionsValue3Get3(data: any,fieldName: string){
 			:after-submit="afterSubmit"
 			add-url="addData"
 			@optionsValue3Get3="optionsValue3Get3"
-		/>
-		<!-- <ak-form
+		/> -->
+		<ak-form
 						
 			ref="formEl"
 			:number="props.pickAppMenu.id"
@ -629,7 +629,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 			:after-submit="afterSubmit"
 			add-url="addData"
 			@optionsValue3Get3="optionsValue3Get3"
-		/> -->
+		/>
 	</el-drawer>
 	
 </template>