From 75a1e3442bff46c6e2f4124455617b0e71e2369b Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Thu, 3 Jun 2021 18:33:23 +0800
Subject: [PATCH] fix

---
 .../form/PhoneVerification/index.vue          | 36 +++++++++++++------
 src/utils/convert.js                          | 12 +++++--
 src/views/form/preview/ProjectForm.vue        | 20 +++++++++++
 src/views/form/statistics/index.vue           | 31 +++++++++++++---
 src/views/form/statistics/public.vue          |  2 +-
 5 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/src/components/form/PhoneVerification/index.vue b/src/components/form/PhoneVerification/index.vue
index 388f735..bf7b1ad 100644
--- a/src/components/form/PhoneVerification/index.vue
+++ b/src/components/form/PhoneVerification/index.vue
@@ -12,19 +12,21 @@
         <el-dialog :visible.sync="open" title="手机号验证">
             <el-form ref="form" :model="phoneValidateForm" :rules="rules" label-width="80px">
                 <el-form-item label="手机号" prop="phoneNumber">
-                    <el-input v-model="phoneValidateForm.phoneNumber" style="width: 80%;" maxlength="11" prefix-icon=" el-icon-mobile "
+                    <el-input v-model="phoneValidateForm.phoneNumber" class="input" maxlength="11" prefix-icon=" el-icon-mobile "
                               show-word-limit
                     />
                 </el-form-item>
                 <el-form-item label="验证码" prop="code">
-                    <el-input v-model="phoneValidateForm.code" style="width: 60%;" prefix-icon="el-icon-message" />
-                    <el-button :disabled="phoneValidateCodeBtn"
-                               style="width: 15%;"
-                               type="primary"
-                               @click="sendValidateMsgHandle"
-                    >
-                        {{ phoneValidateCodeBtnText }}
-                    </el-button>
+                    <el-input v-model="phoneValidateForm.code" class="input" prefix-icon="el-icon-message">
+                        <el-button
+                            slot="append"
+                            :disabled="phoneValidateCodeBtn"
+                            type="primary"
+                            @click="sendValidateMsgHandle"
+                        >
+                            {{ phoneValidateCodeBtnText }}
+                        </el-button>
+                    </el-input>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
@@ -37,7 +39,7 @@
 
 <script>
 export default {
-    name: 'Index',
+    name: 'PhoneVerification',
     props: {
         value: null
     },
@@ -113,8 +115,22 @@ export default {
 <style lang="scss" scoped>
 .phone-number-container {
     display: flex;
+    .input {
+        width: 70%;
+    }
 }
 .phone-number-container ::v-deep.el-form-item__label {
     float: left;
 }
+@media screen and (max-width: 500px) {
+    .phone-number-container ::v-deep.el-form-item__label {
+        float: none !important;
+    }
+    ::v-deep.el-form-item .el-form-item__content {
+        margin-left: 0 !important;
+    }
+    .input {
+        width: 100% !important;
+    }
+}
 </style>
diff --git a/src/utils/convert.js b/src/utils/convert.js
index 43a5a39..0d84078 100644
--- a/src/utils/convert.js
+++ b/src/utils/convert.js
@@ -3,7 +3,13 @@
  *
  */
 import _ from 'lodash'
-import {assistComponents, imageComponents, inputComponents, selectComponents} from '@/components/generator/config'
+import {
+    assistComponents,
+    imageComponents,
+    inputComponents,
+    personalInfoComponents,
+    selectComponents
+} from '@/components/generator/config'
 
 /**
  * 表单json转换为后台需要的对象
@@ -20,7 +26,7 @@ export function formItemConvertData(item, projectKey) {
         'regList': item.__config__.regList,
         'showLabel': item.__config__.showLabel,
         'span': item.__config__.span,
-        'displayType': item.displayType,
+        'displayType': item.__config__.displayType,
         'projectKey': projectKey
     }
     let expand = {}
@@ -49,7 +55,7 @@ export function dbDataConvertForItemJson(data) {
     }
     if (!typeMap.size > 0) {
         // 根据类型获取默认数据
-        _.concat(inputComponents, selectComponents, imageComponents, assistComponents).forEach(item => {
+        _.concat(inputComponents, selectComponents, imageComponents, assistComponents, personalInfoComponents).forEach(item => {
             typeMap.set(item.typeId, item)
         })
     }
diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue
index f7ece41..b184aa9 100644
--- a/src/views/form/preview/ProjectForm.vue
+++ b/src/views/form/preview/ProjectForm.vue
@@ -314,4 +314,24 @@ export default {
         min-width: 300px !important;
     }
 }
+@media screen and (max-width: 500px) {
+    .el-message-box {
+        width: 300px !important;
+    }
+}
+@media screen and (max-width: 500px) {
+    .el-dialog__wrapper .el-dialog {
+        width: 300px !important;
+        .el-dialog__body {
+            padding: 10px 20px !important;
+            .el-form-item__label {
+                width: 68px !important;
+            }
+            //.el-select,
+            //.el-input {
+            //    width: 180px !important;
+        }
+        //}
+    }
+}
 </style>
diff --git a/src/views/form/statistics/index.vue b/src/views/form/statistics/index.vue
index 6730d28..fa1e995 100644
--- a/src/views/form/statistics/index.vue
+++ b/src/views/form/statistics/index.vue
@@ -20,6 +20,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="queryProjectResult">查询</el-button>
+                    <el-button type="primary" @click="customFilterDialogVisible=true">条件</el-button>
                     <el-button type="success" @click="exportProjectResult">导出</el-button>
                 </el-form-item>
             </el-form>
@@ -106,7 +107,7 @@
                     </el-col>
                 </el-row>
                 <el-divider />
-                <el-checkbox-group v-model="checkFixedCustomColumns">
+                <el-checkbox-group v-model="checkedFixedCustomColumns">
                     <el-row>
                         <el-col v-for="(val, key) in fixedDefaultLabelFormColumn" :key="key" :span="4">
                             <el-checkbox :label="key">{{ val }}</el-checkbox>
@@ -127,6 +128,24 @@
                 </span>
             </el-dialog>
         </div>
+        <el-dialog :visible.sync="customFilterDialogVisible" center title="结构化筛选">
+            <div class="flex-center">
+                <el-transfer
+                    v-model="checkedFilterColumns"
+                    filterable
+                    :props="{
+                        key: 'formItemId',
+                        label: 'label'
+                    }"
+                    filter-placeholder="请输入问题名称"
+                    :data="projectItemList"
+                />
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="customColumnDialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="saveStatisticsCheckedColumns">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -146,11 +165,13 @@ export default {
     data() {
         return {
             projectKey: null,
+            customFilterDialogVisible: false,
             customColumnDialogVisible: false,
+            checkedFilterColumns: [],
             // 固定自定义列 如序号等
             fixedCustomColumns: fixedDefaultFormColumn,
             // 选中的
-            checkFixedCustomColumns: fixedDefaultFormColumn,
+            checkedFixedCustomColumns: fixedDefaultFormColumn,
             fixedDefaultLabelFormColumn: fixedDefaultLabelFormColumn,
             // 自定义表单属性
             checkOtherCustomColumns: [],
@@ -205,7 +226,7 @@ export default {
         },
         saveStatisticsCheckedColumns() {
             this.customColumnDialogVisible = false
-            this.fixedCustomColumns = this.checkFixedCustomColumns
+            this.fixedCustomColumns = this.checkedFixedCustomColumns
             this.otherCustomColumns = this.checkOtherCustomColumns
             saveCheckedColumn(this.projectKey, {
                 fixedCustomColumns: this.fixedCustomColumns,
@@ -220,7 +241,7 @@ export default {
             let {fixedCustomColumns, otherCustomColumns} = checkedColumn
             if (fixedCustomColumns) {
                 this.fixedCustomColumns = fixedCustomColumns
-                this.checkFixedCustomColumns = fixedCustomColumns
+                this.checkedFixedCustomColumns = fixedCustomColumns
             }
             if (otherCustomColumns) {
                 this.otherCustomColumns = otherCustomColumns
@@ -248,7 +269,7 @@ export default {
             })
         },
         queryProjectItems() {
-            this.$api.get('/user/project/item/list', {params: {key: this.projectKey}}).then(res => {
+            this.$api.get('/user/project/item/list', {params: {key: this.projectKey, displayType: false}}).then(res => {
                 if (res.data) {
                     res.data.map(item => {
                         _.set(this.projectItemColumns, `field${item.formItemId}`, item.label)
diff --git a/src/views/form/statistics/public.vue b/src/views/form/statistics/public.vue
index 71d43ec..eeb8808 100644
--- a/src/views/form/statistics/public.vue
+++ b/src/views/form/statistics/public.vue
@@ -130,7 +130,7 @@ export default {
             })
         },
         queryProjectItems() {
-            this.$api.get('/user/project/item/list', {params: {key: this.projectKey}}).then(res => {
+            this.$api.get('/user/project/item/list', {params: {key: this.projectKey, displayType: true}}).then(res => {
                 if (res.data) {
                     res.data.map(item => {
                         _.set(this.projectItemColumns, `field${item.formItemId}`, item.label)