v11.1.1

src/components/NewCom/WkCheckbox/index.vue

@@ -40,10 +40,9 @@
 </template>
 
 <script>
-import { isObject, isEmpty } from '@/utils/types'
+import { isObject, isEmpty, isArray } from '@/utils/types'
 import { valueEquals } from 'element-ui/lib/utils/util'
 import Emitter from 'element-ui/lib/mixins/emitter'
-
 export default {
   // 自定义字段库 多选
   name: 'WkCheckbox',
@@ -96,6 +95,12 @@ export default {
         this.validValue()
       },
       immediate: true
+    },
+    options: {
+      handler() {
+        this.validValue()
+      },
+      deep: true
     }
   },
 
@@ -118,18 +123,19 @@ export default {
         }
       } else {
         if (this.otherShowInput) {
-          const otherItem = this.value.filter((name) => !this.options.includes(name))
+          const value = isArray(this.value) ? this.value : []
+          const otherItem = value.filter((name) => !this.options.includes(name))
           if (otherItem.length > 0) {
-            const newValue = this.value.filter((name) => !otherItem.includes(name))
+            const newValue = value.filter((name) => !otherItem.includes(name))
             newValue.push('其他')
             this.dataValue = {
               select: newValue,
               otherValue: otherItem[otherItem.length - 1]
             }
           } else {
-            if (!valueEquals(this.value, this.dataValue.select)) {
+            if (!valueEquals(value, this.dataValue.select)) {
               this.dataValue = {
-                select: this.value,
+                select: value,
                 otherValue: ''
               }
             }

src/components/NewCom/WkDepSelect/index.vue

@@ -3,11 +3,12 @@
     v-elclickoutside="handleClose"
     ref="reference"
     :class="[disabled ? 'is_disabled' : 'is_valid', { 'is_focus': visible }]"
+    :style="{ height: `${height}px` }"
     wrap="wrap"
     class="wk-dep-select xh-form-border"
     @click="containerClick">
 
-    <div class="el-select__tags">
+    <div ref="tags" class="el-select__tags">
       <span
         v-for="(item, index) in showSelects"
         :key="index"
@@ -119,6 +120,7 @@ export default {
       visible: false,
       dataValue: [], // 校准传入值
       loading: false,
+      height: 34,
 
       optionsList: []
     }
@@ -175,6 +177,12 @@ export default {
           this.$emit('input', this.dataValue)
         }
       }
+    },
+    showSelects: {
+      handler() {
+        this.resetHeight()
+      },
+      immediate: true
     }
   },
 
@@ -183,6 +191,16 @@ export default {
   },
 
   methods: {
+    resetHeight() {
+      const tags = this.$refs.tags
+      if (tags) {
+        this.$nextTick(() => {
+          this.height = tags.clientHeight > 34 ? tags.clientHeight + 6 : 34
+        })
+      } else {
+        this.height = 34
+      }
+    },
 
     /**
      * 获取展示的数组
@@ -215,7 +233,7 @@ export default {
       }
 
       if (this.radio && (Array.isArray(this.value) || this.value === null || this.value === undefined)) {
-        this.$emit('input', '')
+        // this.$emit('input', '')
       }
 
       if (this.radio) {
@@ -318,8 +336,10 @@ export default {
       this.$nextTick(() => {
         if (this.radio) {
           this.dispatch('ElFormItem', 'el.form.change', this.dataValue && this.dataValue.length ? this.dataValue[0] : '')
+          this.$emit('input', this.dataValue && this.dataValue.length ? this.dataValue[0] : '')
         } else {
           this.dispatch('ElFormItem', 'el.form.change', this.dataValue)
+          this.$emit('input', this.dataValue)
         }
         this.$emit('change', this.dataValue, this.selects)
       })
@@ -358,6 +378,7 @@ export default {
     color: #ddd;
     line-height: 34px;
     cursor: pointer;
+    user-select: none;
   }
   .delete-icon {
     color: #999;

src/components/NewCom/WkDetailTable/View.vue

@@ -17,14 +17,14 @@
             <div
               v-if="getShowValue(item)"
               :key="index"
-              :class="[`is-${item.formType}`]"
+              :class="[`is-${item.form_type}`]"
               :label="item.name"
               :style="{width: item.stylePercent ? `${item.stylePercent}%` : 'auto'}"
               class="wk-form-item">
               <div class="wk-form-item__label">{{ item.name }}</div>
               <wk-field-view
                 :props="item"
-                :form-type="item.formType"
+                :form_type="item.form_type"
                 :value="fieldForm[sectionIndex][item.field]"
               >
                 <template slot-scope="{ data }">
@@ -50,11 +50,11 @@
           :key="index"
           :prop="item.field"
           :label="item.name"
-          :min-width="getMinWidth(item.formType)">
+          :min-width="getMinWidth(item.form_type)">
           <template slot-scope="{ row, column, $index }">
             <wk-field-view
               :props="item"
-              :form-type="item.formType"
+              :form_type="item.form_type"
               :value="row[item.field]"
             >
               <template slot-scope="{ data }">
@@ -115,12 +115,12 @@ export default {
   beforeDestroy() {},
 
   methods: {
-    getMinWidth(formType) {
-      if (formType === 'date_interval' ||
-      formType === 'dateRange' ||
-       formType === 'file' ||
-       formType === 'location' ||
-       formType === 'position') {
+    getMinWidth(form_type) {
+      if (form_type === 'date_interval' ||
+      form_type === 'dateRange' ||
+       form_type === 'file' ||
+       form_type === 'location' ||
+       form_type === 'position') {
         return 250
       }
       return 150

src/components/NewCom/WkForm/GenerateRules.js

@@ -8,7 +8,7 @@ import {
   regexIsCRMMobile,
   regexIsCRMEmail
 } from '@/utils'
-import { isEmpty } from '@/utils/types'
+import { isEmpty, isObject, isArray } from '@/utils/types'
 
 
 export default {
@@ -41,6 +41,32 @@ export default {
           message: item.name + '不能为空',
           trigger: ['blur', 'change']
         })
+        if (item.form_type == 'detail_table') {
+          tempList.push({
+            validator: ({ item }, value, callback) => {
+              if (this.getDetailTableIsEmpty(item.fieldExtendList, value)) {
+                callback(new Error(item.name + '不能为空'))
+              } else {
+                callback()
+              }
+            },
+            item: item,
+            trigger: ['blur', 'change']
+          })
+        } else if (item.form_type == 'checkbox') {
+          tempList.push({
+            validator: ({ item }, value, callback) => {
+              if (!isArray(value) || value.length === 0) {
+                callback(new Error(item.name + '不能为空'))
+              } else {
+                const emptyObj = value.find(valueItem => isEmpty(valueItem))
+                emptyObj === '' ? callback(new Error(item.name + '不能为空')) : callback()
+              }
+            },
+            item: item,
+            trigger: ['blur', 'change']
+          })
+        }
       }
 
       // 验证唯一
@@ -65,18 +91,22 @@ export default {
           validator: validateUnique,
           item: item,
           trigger:
-            item.formType == 'checkbox' || item.formType == 'select' || item.form_type == 'checkbox' || item.form_type == 'select'
+            item.form_type == 'checkbox' || item.form_type == 'select'
               ? ['change']
               : ['blur']
         })
       }
       // 特殊类型
-      if (item.formType === 'number' || item.form_type === 'number') {
+      if (item.form_type === 'number' || item.form_type === 'percent') {
         const validateCRMNumber = (rule, value, callback) => {
-          if (isEmpty(value) || regexIsCRMNumber(value)) {
-            callback()
+          if (item.hasOwnProperty('precisions')) {
+            this._getNumberRule(rule, value, callback)
           } else {
-            callback(new Error('数字的整数部分须少于15位，小数部分须少于4位'))
+            if (isEmpty(value) || regexIsCRMNumber(value)) {
+              callback()
+            } else {
+              callback(new Error('数字的整数部分须少于15位，小数部分须少于4位'))
+            }
           }
         }
         tempList.push({
@@ -84,12 +114,16 @@ export default {
           item: item,
           trigger: ['blur']
         })
-      } else if (item.formType === 'floatnumber' || item.form_type === 'floatnumber') {
+      } else if (item.form_type === 'floatnumber') {
         const validateCRMMoneyNumber = (rule, value, callback) => {
-          if (isEmpty(value) || regexIsCRMMoneyNumber(value)) {
-            callback()
+          if (item.hasOwnProperty('precisions')) {
+            this._getNumberRule(rule, value, callback)
           } else {
-            callback(new Error('货币的整数部分须少于15位，小数部分须少于2位'))
+            if (isEmpty(value) || regexIsCRMMoneyNumber(value)) {
+              callback()
+            } else {
+              callback(new Error('货币的整数部分须少于15位，小数部分须少于2位'))
+            }
           }
         }
         tempList.push({
@@ -97,7 +131,7 @@ export default {
           item: item,
           trigger: ['blur']
         })
-      } else if (item.formType === 'mobile' || item.form_type === 'mobile') {
+      } else if (item.form_type === 'mobile') {
         const validateCRMMobile = (rule, value, callback) => {
           if (isEmpty(value) || regexIsCRMMobile(value)) {
             callback()
@@ -110,7 +144,7 @@ export default {
           item: item,
           trigger: ['blur']
         })
-      } else if (item.formType === 'email' || item.form_type === 'email') {
+      } else if (item.form_type === 'email') {
         const validateCRMEmail = (rule, value, callback) => {
           if (isEmpty(value) || regexIsCRMEmail(value)) {
             callback()
@@ -123,9 +157,90 @@ export default {
           item: item,
           trigger: ['blur']
         })
+      } else if (item.form_type === 'location' && item.is_null == 1) {
+        const validateLocation = (rule, value, callback) => {
+          if (!isObject(value) || (
+            isObject(value) && isEmpty(value.lat) && isEmpty(value.lng) && isEmpty(value.address)
+          )) {
+            callback(new Error(item.name + '不能为空'))
+          } else {
+            callback()
+          }
+        }
+        tempList.push({
+          validator: validateLocation,
+          item: item,
+          trigger: ['change']
+        })
       }
 
       return tempList
+    },
+
+    /**
+     * 获取数值规则
+     */
+    _getNumberRule(rule, value, callback) {
+      const field = rule.item
+
+      const arr = String(value).split('.')
+
+      const len = String(value)
+        .replace('.', '')
+        .replace('-', '')
+        .length
+      const maxlength = field.form_type === 'percent' ? 10 : 15
+
+      const min = isEmpty(field.minNumRestrict) ? -Infinity : Number(field.minNumRestrict || -Infinity)
+      const max = isEmpty(field.maxNumRestrict) ? Infinity : Number(field.maxNumRestrict || Infinity)
+
+      if (len > maxlength) {
+        callback(new Error(`最多支持${maxlength}位数字（包含小数位）`))
+      } else if (isEmpty(field.precisions) && String(value).includes('.')) {
+        // null 不支持小数  0 不限制小数位
+        callback(new Error(`不支持小数`))
+      } else if (arr.length > 1 && arr[1].length > Number(field.precisions)) {
+        callback(new Error(`小数位不能大于${field.precisions}`))
+      } else if (value < min) {
+        callback(new Error(`不能小于${min}`))
+      } else if (value > max) {
+        callback(new Error(`不能大于${max}`))
+      } else {
+        callback()
+      }
+    },
+
+    /**
+     * 判断明细表格是否是空
+     * @param {*} fieldList
+     * @param {*} valueObj
+     */
+    getDetailTableIsEmpty(fieldList, valueObjs) {
+      for (let index = 0; index < valueObjs.length; index++) {
+        const valueObj = valueObjs[index]
+        if (this.judgeFormValueIsEmpty(fieldList, valueObj)) {
+          return true
+        }
+      }
+      return false
+    },
+
+    /**
+     * 判断对象值是否是空
+     */
+    judgeFormValueIsEmpty(fieldList, valueObj) {
+      for (let index = 0; index < fieldList.length; index++) {
+        const field = fieldList[index]
+        const value = valueObj[field.field]
+        if (field.form_type === 'location') {
+          if (isObject(value) && (!isEmpty(value.lat) || !isEmpty(value.lng) || !isEmpty(value.address))) {
+            return false
+          }
+        } else if (!isEmpty(value)) {
+          return false
+        }
+      }
+      return true
     }
   }
 }

src/components/NewCom/WkForm/Mixin.js

@@ -70,7 +70,7 @@ export default {
      * 获取提示语
      */
     getTips(data) {
-      const tips = data.tips || data.inputTips
+      const tips = data.tips || data.input_tips
       return tips ? `（${tips}）` : ''
     },
     /**

src/components/NewCom/WkForm/WkFormItem.vue

@@ -127,4 +127,12 @@ export default {
   padding: 12px 12px 0;
   margin-bottom: 0;
 }
+.el-form-item.is-user {
+  display: flex ;
+  flex-direction: column ;
+}
+.el-form-item.is-structure {
+  display: flex;
+  flex-direction: column;
+}
 </style>

src/components/NewCom/WkForm/utils.js

@@ -42,7 +42,11 @@ export function getFormFieldShowName(form_type, value, placeholder = '--', item)
     if (isEmpty(newValue)) {
       return placeholder
     } else {
-      return newValue
+      if (isArray(newValue)) {
+        return newValue.join(',')
+      } else {
+        return newValue
+      }
     }
   } else if (form_type === 'structure') {
     if (isArray(value)) {

src/components/XrUpgradeDialog.vue

@@ -33,22 +33,7 @@ export default {
   },
   data() {
     return {
-      message: `新增：
-1、增加多种自定义字段类型，支持自定义字段占比配置及布局调整；
-2、客户管理：新增团队成员有效时间；优化团队成员权限；联系人和回款模块增加团队成员功能；增加相关团队字段，支持通过相关团队对团队成员进行筛选；
-3、新增日志点赞互动功能；
-4、新增发票模块自定义字段、发票导出功能；
-5、增加市场活动自定义表单
-6、跟进记录增加导入导出功能
-7、导入数据时，增加“负责人”字段
-8、角色权限：系统管理角色新增权限"角色权限查看"，控制在新建员工选择角色和编辑员工角色时，可查看和选择角色的范围；
-
-优化：
-1、优化客户管理仪表盘，图表展示和统计数据等；
-2、优化导出，支持操作一万条以上数据；
-3、高级筛选判断符优化调整；时间筛选增加固定时间段（例如今日、本月、本年等）；
-4、权限优化
-
+      message: `
 修复：
 1、修复其他已知bug。`
     }

src/config.js

@@ -3,8 +3,8 @@ const getLocationOrigin = () => {
 }
 
 const companyName = '悟空CRM'
-const version = 'V11.1.0'
-const baiduKey = 'lcuOQ71SCZhqpxsr1vL2mXoplWEoVctL'
+const version = 'V11.1.1'
+const baiduKey = '百度key'
 
 export default {
   version,

src/mixins/CustomFields.js

@@ -17,10 +17,10 @@ export default {
      */
     getItemValue(item, detail, type) {
       detail = detail || {}
-      if ((item.form_type || item.form_type) == 'contacts' ||
-          (item.form_type || item.form_type) == 'customer' ||
-          (item.form_type || item.form_type) == 'contract' ||
-          (item.form_type || item.form_type) == 'business'
+      if (item.form_type == 'contacts' ||
+          item.form_type == 'customer' ||
+          item.form_type == 'contract' ||
+          item.form_type == 'business'
       ) {
         // crm相关信息特殊处理
         if (type === 'update') {
@@ -55,12 +55,10 @@ export default {
             ? objDeepCopy(item.default_value.id)
             : ''
         }
-      } else if (item.form_type == 'user' ||
-            item.form_type == 'structure' ||
-            item.form_type == 'file' ||
-            item.form_type == 'user' ||
-            item.form_type == 'structure' ||
-            item.form_type == 'file'
+      } else if (
+        item.form_type == 'user' ||
+        item.form_type == 'structure' ||
+        item.form_type == 'file'
       ) {
         if (type === 'update') {
           return item.value ? objDeepCopy(item.value) : []
@@ -72,11 +70,8 @@ export default {
       } else {
         if (
           item.form_type == 'number' ||
-        item.form_type == 'floatnumber' ||
-        item.form_type == 'percent' ||
-        item.form_type == 'number' ||
-        item.form_type == 'floatnumber' ||
-        item.form_type == 'percent'
+          item.form_type == 'floatnumber' ||
+          item.form_type == 'percent'
         ) {
           if (type == 'update') {
             return isEmpty(item.value) ? undefined : item.value
@@ -453,9 +448,9 @@ export default {
         }
         return ''
       } else if (field.form_type == 'checkbox') {
-        if (isArray(dataValue)) {
-          return dataValue.join(',')
-        }
+        // if (isArray(dataValue)) {
+        //   return dataValue.join(',')
+        // }
         return dataValue
       } else if (field.form_type == 'date') {
         if (dataValue) {
@@ -506,11 +501,12 @@ export default {
       for (let index = 0; index < fieldList.length; index++) {
         const field = fieldList[index]
         const value = valueObj[field.field]
-        if (field.form_type === 'select' || field.form_type === 'checkbox') {
-          if (isObject(value) && !isEmpty(value.select)) {
-            return false
-          }
-        } else if (field.form_type === 'location') {
+        // if (field.form_type === 'select' || field.form_type === 'checkbox') {
+        //   if (isObject(value) && !isEmpty(value.select)) {
+        //     return false
+        //   }
+        // } else if (field.form_type === 'location') {
+        if (field.form_type === 'location') {
           if (isObject(value) && (!isEmpty(value.lat) || !isEmpty(value.lng) || !isEmpty(value.address))) {
             return false
           }

src/views/admin/fields/components/FieldItem/FieldDetailTable.vue

@@ -43,8 +43,10 @@
               :key="index"
               :prop="field.fieldName"
               :label="field.name">
-              <template slot-scope="scope">
-                <div class="input-box" />
+              <template slot-scope="{ row, column }">
+                <div class="input-box" >
+                  {{ row[column.property] }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="操作" fixed="right">
@@ -115,9 +117,9 @@ export default {
         fallbackClass: 'draggingStyle',
         filter: '.empty-box'
       },
-      selectedPoint: [null, null],
+      selectedPoint: [null, null]
 
-      tableData: [{}]
+      // tableData: [{}]
     }
   },
   computed: {
@@ -129,9 +131,28 @@ export default {
     },
     list() {
       return this.isEmpty ? [] : this.field.fieldExtendList
+    },
+    tableData() {
+      const obj = {}
+      this.list.forEach(item => {
+        obj[item.fieldName] = this.formatterDefaultValue(item)
+      })
+      return [obj]
     }
   },
   methods: {
+    formatterDefaultValue(data) {
+      if (!data.default_value) return ''
+      if (data.form_type === 'boolean_value') {
+        return { '0': '不选中', '1': '选中' }[data.default_value] || '不选中'
+      } else if (data.form_type === 'datatime' || data.form_type === 'date_interval') {
+        return data.default_value.join('-')
+      } else if (data.form_type === 'checkbox') {
+        return data.default_value.join(',')
+      } else if (typeof data.default_value === 'string') {
+        return data.default_value
+      }
+    },
     dragListEnd(evt) {
       // console.log('table drag list end', evt)
     },
@@ -204,7 +225,7 @@ export default {
     width: 100%;
     height: 30px;
     border: 1px solid #dcdfe6;
-    padding: 3px 0;
+    padding: 3px 5px;
   }
 
   .table-field {

src/views/admin/fields/components/SettingField/SettingDefault.vue

@@ -86,7 +86,7 @@
 import WkDistpicker from '@/components/NewCom/WkDistpicker'
 
 import { isEmpty, isArray } from '@/utils/types'
-import { regexIsCRMMobile, regexIsCRMEmail, objDeepCopy } from '@/utils'
+import { objDeepCopy } from '@/utils'
 import { getFieldAuth } from '../../utils'
 
 export default {
@@ -217,64 +217,65 @@ export default {
   methods: {
     inputBlur() {
       // this.$emit('input', this.value)
-      if (!this.field.default_value) return
-      if (this.field.form_type === 'mobile') {
-        // 校验手机号
-        if (!regexIsCRMMobile(this.field.default_value)) {
-          this.$message.error('输入的手机格式有误')
-          this.field.default_value = ''
-        }
-      } else if (this.field.form_type === 'email') {
-        // 校验邮箱
-        if (!regexIsCRMEmail(this.field.default_value)) {
-          this.$message.error('输入的邮箱格式有误')
-          this.field.default_value = ''
-        }
-      } else if (this.type === 'number') {
-        // 校验数字类型
-        const num = Number(this.field.default_value) // 去0
-        if (isNaN(num)) {
-          this.field.default_value = null
-          return
-        }
-        this.field.default_value = String(num)
-        const arr = String(num).split('.')
+      // if (!this.field.default_value) return
+      // if (this.field.form_type === 'mobile') {
+      //   // 校验手机号
+      //   if (!regexIsCRMMobile(this.field.default_value)) {
+      //     this.$message.error('输入的手机格式有误')
+      //     this.field.default_value = ''
+      //   }
+      // } else if (this.field.form_type === 'email') {
+      //   // 校验邮箱
+      //   if (!regexIsCRMEmail(this.field.default_value)) {
+      //     this.$message.error('输入的邮箱格式有误')
+      //     this.field.default_value = ''
+      //   }
+      // } else if (this.type === 'number') {
+      //   console.log(111)
+      //   // 校验数字类型
+      //   const num = Number(this.field.default_value) // 去0
+      //   if (isNaN(num)) {
+      //     this.field.default_value = null
+      //     return
+      //   }
+      //   this.field.default_value = String(num)
+      //   const arr = String(num).split('.')
 
-        const len = String(num)
-          .replace('.', '')
-          .replace('-', '')
-          .length
-        const maxlength = this.field.form_type === 'percent' ? 10 : 15
-        if (len > maxlength) {
-          this.$message.error(`最多支持${maxlength}位数字（包含小数位）`)
-          this.field.default_value = null
-          return
-        }
+      //   const len = String(num)
+      //     .replace('.', '')
+      //     .replace('-', '')
+      //     .length
+      //   const maxlength = this.field.form_type === 'percent' ? 10 : 15
+      //   if (len > maxlength) {
+      //     this.$message.error(`最多支持${maxlength}位数字（包含小数位）`)
+      //     this.field.default_value = null
+      //     return
+      //   }
 
-        const min = isEmpty(this.field.minNumRestrict) ? -Infinity : Number(this.field.minNumRestrict || -Infinity)
-        const max = isEmpty(this.field.maxNumRestrict) ? Infinity : Number(this.field.maxNumRestrict || Infinity)
-        if (num < min) {
-          this.$message.error('默认值不能小于最小值')
-          this.field.default_value = null
-          return
-        }
-        if (num > max) {
-          this.$message.error('默认值不能大于最大值')
-          this.field.default_value = null
-          return
-        }
+      //   const min = isEmpty(this.field.minNumRestrict) ? -Infinity : Number(this.field.minNumRestrict || -Infinity)
+      //   const max = isEmpty(this.field.maxNumRestrict) ? Infinity : Number(this.field.maxNumRestrict || Infinity)
+      //   if (num < min) {
+      //     this.$message.error('默认值不能小于最小值')
+      //     this.field.default_value = null
+      //     return
+      //   }
+      //   if (num > max) {
+      //     this.$message.error('默认值不能大于最大值')
+      //     this.field.default_value = null
+      //     return
+      //   }
 
-        // null 不支持小数  0 不限制小数位
-        if (isEmpty(this.field.precisions)) {
-          this.field.default_value = arr[0]
-          return
-        }
-        if (this.field.precisions === 0) return
-        if (arr.length > 1 && arr[1].length > Number(this.field.precisions)) {
-          this.$message.error(`默认值的小数位不能大于${this.field.precisions}`)
-          this.field.default_value = null
-        }
-      }
+      //   // null 不支持小数  0 不限制小数位
+      //   if (isEmpty(this.field.precisions)) {
+      //     this.field.default_value = arr[0]
+      //     return
+      //   }
+      //   if (this.field.precisions === 0) return
+      //   if (arr.length > 1 && arr[1].length > Number(this.field.precisions)) {
+      //     this.$message.error(`默认值的小数位不能大于${this.field.precisions}`)
+      //     this.field.default_value = null
+      //   }
+      // }
     },
 
     /**

src/views/admin/fields/components/SettingField/index.vue

@@ -117,7 +117,7 @@
         </div>
 
         <div
-          v-if="fieldAuth.uniqueEdit"
+          v-if="fieldAuth.uniqueEdit && !['checkbox','file'].includes(field.form_type)"
           class="item-check-section">
           <el-checkbox
             v-model="field.is_unique"

src/views/admin/fields/index.vue

@@ -120,6 +120,7 @@ import Field from './field'
 import FieldTypeLib from './fieldTypeLib'
 import { objDeepCopy } from '@/utils/index'
 import { typeToComponent } from './utils'
+import { regexIsCRMMobile, regexIsCRMEmail } from '@/utils'
 
 export default {
   name: 'FieldsIndex',
@@ -504,6 +505,7 @@ export default {
       const copyField = objDeepCopy(field)
       delete copyField.field_id
       delete copyField.fieldName
+      delete copyField.field
       delete copyField.relevant
       copyField.field_type = 0
       copyField.operating = 255
@@ -734,6 +736,75 @@ export default {
         if (item.hasOwnProperty('optionsData')) {
           delete item.optionsData
         }
+
+        if (item.form_type === 'mobile' && item.default_value) {
+        // 校验手机号
+          if (!regexIsCRMMobile(item.default_value)) {
+            this.$message.error('输入的手机格式有误')
+            this.loading = false
+            return
+          }
+        }
+        if (item.form_type === 'email' && item.default_value) {
+        // 校验邮箱
+          if (!regexIsCRMEmail(item.default_value)) {
+            this.$message.error('输入的邮箱格式有误')
+
+            this.loading = false
+            return
+          }
+        }
+        if (item.form_type === 'number' && item.default_value) {
+          // 校验数字类型
+          const num = Number(item.default_value) // 去0
+          if (isNaN(num)) {
+            this.$message.error('数字输入错误')
+            this.loading = false
+            return
+          }
+          item.default_value = String(num)
+          const arr = String(num).split('.')
+
+          const len = String(num)
+            .replace('.', '')
+            .replace('-', '')
+            .length
+          const maxlength = item.form_type === 'percent' ? 10 : 15
+          if (len > maxlength) {
+            this.$message.error(`最多支持${maxlength}位数字（包含小数位）`)
+
+            this.loading = false
+            return
+          }
+
+          const min = isEmpty(item.minNumRestrict) ? -Infinity : Number(item.minNumRestrict || -Infinity)
+          const max = isEmpty(item.maxNumRestrict) ? Infinity : Number(item.maxNumRestrict || Infinity)
+          if (num < min) {
+            this.$message.error('默认值不能小于最小值')
+
+            this.loading = false
+            return
+          }
+          if (num > max) {
+            this.$message.error('默认值不能大于最大值')
+
+            this.loading = false
+            return
+          }
+
+          // null 不支持小数  0 不限制小数位
+          if (isEmpty(item.precisions)) {
+            this.loading = false
+            return
+          }
+          if (item.precisions === 0) return
+          if (arr.length > 1 && arr[1].length > Number(item.precisions)) {
+            this.$message.error(`默认值的小数位不能大于${item.precisions}`)
+
+            this.loading = false
+            return
+          }
+        }
       }
 
       // 请求参数

src/views/crm/components/CRMEditBaseInfo.vue

@@ -733,7 +733,7 @@ export default {
     editClick(item) {
       let dataValue = objDeepCopy(this.allForm[item.fieldName])
       // 明细表格是空时，需要填充一条空数据，展示时未处理。这里增加
-      if (item.formType === 'detail_table' && isEmpty(dataValue)) {
+      if (item.form_type === 'detail_table' && isEmpty(dataValue)) {
         dataValue = this.getItemValue(objDeepCopy(item), null, 'update')
       }
       this.$set(this.editForm, item.fieldName, dataValue)
@@ -784,7 +784,7 @@ export default {
       for (let index = 0; index < this.editFieldData.length; index++) {
         const field = this.editFieldData[index]
         // 获取当前编辑 和 隐藏的字段
-        if (field.formType !== 'desc_text' && (field.isEdit || !field.show)) {
+        if (field.form_type !== 'desc_text' && (field.isEdit || !field.show)) {
           list.push({
             fieldName: field.fieldName,
             field: field.field,

src/views/crm/components/FilterForm/index.vue

@@ -667,6 +667,24 @@ export default {
             // start: new Date(o.value[0]).getTime() / 1000,
             // end: new Date(o.value[1]).getTime() / 1000
           })
+        } else if (
+          o.form_type == 'number' ||
+          o.form_type == 'floatnumber' ||
+          o.form_type == 'percent'
+        ) {
+          let dataValues = []
+          if (o.type === 14) {
+            dataValues = [isEmpty(o.min) ? '' : o.min, isEmpty(o.max) ? '' : o.max]
+          } else {
+            dataValues = [o.value]
+          }
+          obj.push({
+            condition: o.condition,
+            form_type: o.form_type,
+            name: o.name,
+            type: o.field,
+            value: dataValues
+          })
         } else if (o.form_type == 'business_type') {
           obj.push({
             // condition: o.condition,