From 1004264ebd5d2667efe12f8d8638dbada94423ee Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 6 Feb 2025 16:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=A1=8C=E6=96=87=E6=9C=AC=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E6=89=AB=E6=8F=8F=E8=BE=93=E5=85=A5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=BC=80=E5=85=B3=E5=8F=8A=E6=96=B9=E5=BC=8F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  4 +-
 .../DesignForm/formControlPropertiNew.vue     | 51 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index a5d0618..38bdf76 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -217,7 +217,9 @@ export default [
 				iconFont: 'fa-text-width',
 				control: {
 					// 组件所有属性
-					modelValue: ''
+					modelValue: '',
+					scanInputFlag: false,
+					scanType:'',
 				},
 				config: {}, // 其他配置信息
 				styles: {
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 9d8aab2..e372ecd 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -527,6 +527,7 @@ const attrList = computed(() => {
         path: "config.append",
         vShow: ["input", "password", "digitpage"],
       },
+      
       // {
       //     label: '状态打开时的值',
       //     value: control.activeValue,
@@ -733,6 +734,14 @@ const attrList = computed(() => {
         vIf: state.isSearch,
         vShow: ["associatedForms"],
       },
+      {
+        label: "移动端扫描输入",
+        value: config.scanInput,
+        path: "config.scanInput",
+        type: "input",
+        vIf: state.isSearch,
+        vShow: ["input"],
+      },
       {
         label: "隐藏条件",
         value: config.associatedForms,
@@ -3351,6 +3360,19 @@ const gainFormGroupList = () => {
       }
     });
 };
+//liwenxuan 2025 移动端单选扫描输入功能 start
+const scanTypes = [
+  {
+    value: 'QrCode',
+    label: '二维码',
+  },
+  {
+    value: 'OCR',
+    label: '光学字符识别',
+  },
+]
+//liwenxuan 2025 移动端单选扫描输入功能 end
+
 let asfs: any[] = [];
 let asfsExpectCurrent: any[] = [];
 
@@ -4207,6 +4229,35 @@ const updataBase = (val: any) => {
                 >
               </el-row>
 
+              <el-row v-else-if="item.type === 'input'"><!-- 移动端扫描输入 -->
+                <el-switch v-model="controlData.control.scanInputFlag" />
+                <div
+                  v-if="controlData.control.scanInputFlag"
+                  style="
+                    display: flex;
+                    width: auto;
+                    margin-top: 33px;
+                    margin-left: -125px;
+                    padding-bottom: 6px;
+                  "
+                >
+                  <div style="margin-right: 12px;">扫描方式</div>
+                  <el-select
+										
+										v-model="controlData.control.scanType"
+										style="width: 150px; height:20px">
+										<el-option
+                      v-for="scanType in scanTypes"
+                      :key="scanType.value"
+                      :label="scanType.label"
+                      :value="scanType.value"
+										/>
+										
+									</el-select>
+                </div>
+                  
+              </el-row>
+
               <el-row v-else-if="item.type === 'associatedForms_dataRange'">
                 <el-button
                   v-if="controlData.control.dataRangeConditionHtml === ''"