centaline-data-driven 1.2.76 → 1.2.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.76",
+  "version": "1.2.79",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "3"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,6 +1,5 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <!-- <ct-form :api="'/salematter/squareupload/readDetail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
@@ -18,11 +17,13 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
-        apiParam:{actionType: "3",
-originalTraId: "1522961155108978690",
-pageOnly: "true",
-pageStyle: "2",
-pageTitle: "成交报告"}
+        apiParam:{
+actionType: 3,
+originalTraId: "1526048947277938690",
+pageOnly: true,
+pageStyle: 2,
+pageTitle: "成交报告"
+          }
       }
     },
     methods: {

package/src/SearchList.vue

@@ -4,8 +4,8 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/salemattersmanage/squareuploadlist/getLayoutOfSearch'" 
-    :searchDataApi="'/salemattersmanage/squareuploadlist/getList'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/api/distribution/agentRelationProperty/getLayoutOfSearch'" 
+    :searchDataApi="'/api/distribution/agentRelationProperty/list'" :apiParam="para"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -25,7 +25,13 @@
     name: 'DataDrivenSearch',
     data() {
       return {
-        para:{},
+        para:{
+agentId: "1491335181504401409",
+delegateType: "1",
+estateId: "18721",
+estateName: "凯旋路1798号"
+
+        },
         // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
         // para: {publishID: "1503900718229229568"}
         // para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}

package/src/centaline/common/index.js

@@ -644,7 +644,7 @@ const common = {
    * @param {String} str 需要转换的字符串
    * @desc 首字母转小写。
    */
-  initialsToUpperCase(str) {
+  initialsToLowerCase(str) {
     if (typeof str === 'undefined') {
       return str;
     }
@@ -653,6 +653,15 @@ const common = {
     str = charUpper + str.slice(1);
     return str;
   },
+  initialsToUpperCase(str) {
+    if (typeof str === 'undefined') {
+      return str;
+    }
+    let char = str.charAt(0);
+    let charUpper = char.toUpperCase();
+    str = charUpper + str.slice(1);
+    return str;
+  },
 
   /**
    * @method

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -53,7 +53,7 @@
   </el-button>
   <el-button v-else  class="max"
     :type="model.isHyperLink ? 'text' : 'primary'"
-    v-bind="model.attrs" @click="$emit('click',model)"
+    v-bind="model.attrs" @click="clickHandle"
     :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
@@ -149,7 +149,7 @@
           }
         }
         else{
-          this.$emit('click',this.model);
+          this.$emit('click',this.model,this.rowData,this.rowindex);
         }
       },
       callTelClick(data){

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -245,10 +245,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -359,6 +359,7 @@
               self.$common.openDialog(dialogOption);
             }
             else if (field.isOpenList) {
+              submitData = field.getActionPara(submitData).para;
               var dialogOption = {
                 title: field.pageTitle,
                 pane: self.$common.getParentPane(self),
@@ -385,10 +386,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -556,10 +556,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -365,10 +365,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -328,16 +328,7 @@
               }
 
               if (!submitData) {
-                submitData = {};
-                var tempFormData = self.model.getFormObj();
-                if(field.flagAttachSearchCondition){
-                  submitData.jsonData=tempFormData;
-                }
-                else{
-                  field.submitFormField.forEach((v) => {
-                    submitData[v] = tempFormData[v];
-                  });
-                }
+                submitData = self.getFileData(field);
               }
 
               if (field.isOpenForm) {
@@ -395,10 +386,14 @@
                 };
                 self.$common.openDialog(dialogOption);
               }
-              else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+              else if (field.isFormPageInTab) {// 外部框架tab页打开
                 submitData = field.getActionPara(submitData).para;
                 self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle,self.model,field.dialogWidth);
               }
+              else if (field.isSearchPageInTab) {// 外部框架tab页打开
+                submitData = field.getActionPara(submitData).para;
+                self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+              }
               else if (field.isBrowserNewTab) {// 浏览器打开
                 submitData = field.getActionPara(submitData).para;
                 let query = self.$common.objectToQueryStr(submitData);
@@ -410,8 +405,13 @@
               }
               else {
                 submitData = field.getActionPara(submitData).para;
-                field.doAction(submitData, (data) => {                  
-                  self.model.doAction(data);
+                field.doAction(submitData, (data) => {
+                  if(field && field.changeCallBackFunName){
+                    self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
+                  }
+                  else{
+                    self.model.doAction(data);
+                  }
                 })
               }
             }
@@ -619,6 +619,7 @@
         return formData;
       },
       getFileData(field) {
+        var self=this;
         var submitData = {};
         var tempFormData = this.model.getFormObj();
         if(field.flagAttachSearchCondition){
@@ -627,7 +628,12 @@
         else{
           if(field.submitFormField){
             field.submitFormField.forEach((v) => {
-              submitData[v] = tempFormData[v];
+              if(tempFormData[v]){
+                submitData[v] = tempFormData[v];
+              }
+              else{
+                submitData[v] = tempFormData[self.$common.initialsToUpperCase(v)];
+              }
             });
           }
         }

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -22,9 +22,10 @@
               </template>
               <template slot-scope="scope">
                 <span v-if="scope.row.isSet">
-                  <component ref="Fields" :is="v.is" :vmodel="model.currentRow.data[v.id]" :api="model.OptApi"
-                             @change="changeHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"
-                             @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
+                  <component ref="Fields" :is="model.currentRow.data[v.id].locked || model.currentRow.data[v.id].is!==v.is?model.currentRow.data[v.id].is:v.is" 
+                    :vmodel="model.currentRow.data[v.id]" :api="model.OptApi"
+                    @change="changeHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"
+                    @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
                 <span v-else-if="v.is=='ct-sensitiveeye'">
                   <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
@@ -308,7 +309,8 @@
                 const value = Number(curr);
                 if (!isNaN(value)) {
                   return Number(prev + curr);
-                } else {
+                } 
+                else {
                   return Number(prev);
                 }
               }, 0);
@@ -316,7 +318,8 @@
               if (data[0][column.property].decimals && data[0][column.property].decimals > 0) {
                 sums[index] = sums[index].toFixed(data[0][column.property].decimals);
               }
-            } else {
+            } 
+            else {
               sums[index] = 'N/A';
             }
           }

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -146,13 +146,17 @@
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             // 外部框架tab页打开
-            if (field.isFormPageInTab || field.isSearchPageInTab) {
+            if (field.isFormPageInTab) {
               submitData = field.getActionPara(submitData).para;
               if (field.pageStyle) {
                 submitData.pageStyle = field.pageStyle;
               }
               self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model, field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -728,13 +728,17 @@
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             // 外部框架tab页打开
-            if (field.isFormPageInTab || field.isSearchPageInTab) {
+            if (field.isFormPageInTab) {
               submitData = field.getActionPara(submitData).para;
               if (field.pageStyle) {
                 submitData.pageStyle = field.pageStyle;
               }
               self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/formData/index.js

@@ -33,7 +33,7 @@ const formData = {
     },
     //获取Field的属性attrKey的值
     getValueByFieldName(id, attrKey) {
-        attrKey = this.common.initialsToUpperCase(attrKey);
+        attrKey = this.common.initialsToLowerCase(attrKey);
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             return rtn1.source[attrKey];
@@ -41,7 +41,7 @@ const formData = {
     },
     //设置Field的属性attrKey的值
     setValueByFieldName(id, attrKey, attrValue) {
-        attrKey = this.common.initialsToUpperCase(attrKey);
+        attrKey = this.common.initialsToLowerCase(attrKey);
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             rtn1.source[attrKey] = attrValue;
@@ -151,7 +151,7 @@ const formData = {
 
         let data = this.getListField(tableName, rowNum, fiedlId);
 
-        attrName = this.common.initialsToUpperCase(attrName);
+        attrName = this.common.initialsToLowerCase(attrName);
         attrName = attrName ? attrName : 'code1';
 
         if (!fiedlId) {
@@ -180,7 +180,7 @@ const formData = {
         tableName = tableName ? tableName : this.form.scripts.$fd;
         let data = this.getListField(tableName, rowNum, fiedlId);
 
-        attrName = this.common.initialsToUpperCase(attrName);
+        attrName = this.common.initialsToLowerCase(attrName);
         attrName = attrName ? attrName : 'code1';
 
         if (!fiedlId) {

package/src/centaline/loader/src/ctl/Base.js

@@ -148,6 +148,9 @@ const Base = function (source) {
     get lock() {
       return source.locked;
     },
+    get locked() {
+      return source.locked;
+    },
     set locked(v) {
       source.locked = v;
     },
@@ -275,6 +278,9 @@ const Base = function (source) {
     get singleLine() {
       return source.singleLine;
     },
+    get decimals() {
+      return source.decimals1;
+    },
   };
 
   return rtn;

package/src/centaline/loader/src/ctl/Contact.js

@@ -33,7 +33,7 @@ const ContactList = function (source,para ,callBack) {
         return false;
       },
       get primaryKey() {
-        return common.initialsToUpperCase(data.content.primaryFieldName);
+        return common.initialsToLowerCase(data.content.primaryFieldName);
       },
       get primaryFieldMappingDBName() {
         return data.content.primaryFieldMappingDBName;
@@ -123,7 +123,7 @@ const ContactList = function (source,para ,callBack) {
                 return v;
               },
               get id() {
-                return common.initialsToUpperCase(v.fieldName);
+                return common.initialsToLowerCase(v.fieldName);
               },
               get name() {
                 return v.displayName;

package/src/centaline/loader/src/ctl/ContactList.js

@@ -29,7 +29,7 @@ const ContactList = function (source,para ,callBack) {
         size: 'mini'
       },
       get primaryKey() {
-        return common.initialsToUpperCase(source.content.primaryFieldName);
+        return common.initialsToLowerCase(source.content.primaryFieldName);
       },
       get primaryFieldMappingDBName() {
         return source.content.primaryFieldMappingDBName;
@@ -128,7 +128,7 @@ const ContactList = function (source,para ,callBack) {
                 return v;
               },
               get id() {
-                return common.initialsToUpperCase(v.fieldName);
+                return common.initialsToLowerCase(v.fieldName);
               },
               get name() {
                 return v.displayName;

package/src/centaline/loader/src/ctl/Form.js

@@ -188,7 +188,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //获取Field的属性attrKey的值
         getValueByFieldName(id, attrKey) {
-            attrKey = this.common.initialsToUpperCase(attrKey);
+            attrKey = this.common.initialsToLowerCase(attrKey);
             var rtn1 = this.fieldsDic[id];
             if (rtn1) {
                 return rtn1.source[attrKey];
@@ -196,7 +196,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //设置Field的属性attrKey的值
         setValueByFieldName(id, attrKey, attrValue) {
-            attrKey = this.common.initialsToUpperCase(attrKey);
+            attrKey = this.common.initialsToLowerCase(attrKey);
             var rtn1 = this.fieldsDic[id];
             if (rtn1) {
                 rtn1.source[attrKey] = attrValue;
@@ -306,7 +306,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
             let data = this.getListField(tableName, rowNum, fiedlId);
 
-            attrName = this.common.initialsToUpperCase(attrName);
+            attrName = this.common.initialsToLowerCase(attrName);
             attrName = attrName ? attrName : 'code1';
 
             if (!fiedlId) {
@@ -335,7 +335,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             tableName = tableName ? tableName : this.form.scripts.$fd;
             let data = this.getListField(tableName, rowNum, fiedlId);
 
-            attrName = this.common.initialsToUpperCase(attrName);
+            attrName = this.common.initialsToLowerCase(attrName);
             attrName = attrName ? attrName : 'code1';
 
             if (!fiedlId) {
@@ -392,10 +392,17 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //新增或替换表格数据
         insertOrUpdateRow(tableId,row) {    
-            let listData = this.excuteListData.find((v) => {
-                return v.id === tableId;
-            });
-            listData.insertOrUpdateRow(row);
+          let listData = this.excuteListData.find((v) => {
+              return v.id === tableId;
+          });
+          listData.insertOrUpdateRow(row);
+        },
+        //删除表格数据
+        deleteRow(tableId,row) {    
+          let listData = this.excuteListData.find((v) => {
+              return v.id === tableId;
+          });
+          listData.delRow(row);
         },
         //清空表格数据
         clear(tableId) {

package/src/centaline/loader/src/ctl/FormList.js

@@ -465,19 +465,29 @@ const FormList = function (source, master) {
     },
     insertOrUpdateRow(row) {
       if(row){
-        source.rows.push(r);
-        let iRow = this.initRow(r);
-        iRow.isNewFlag = true;
-        rtn._rows.push(iRow);
-        Vue.set(r, 'edit', iRow.edit);
-        Vue.set(r, 'delete', iRow.delete);
-        r.$sourceIndex = rtn._rows.length - 1;
+        // source.rows.push(r);
+        // let iRow = this.initRow(r);
+        // iRow.isNewFlag = true;
+        // rtn._rows.push(iRow);
+        // Vue.set(r, 'edit', iRow.edit);
+        // Vue.set(r, 'delete', iRow.delete);
+        // r.$sourceIndex = rtn._rows.length - 1;
 
-        let rowData = rtn.rowsItemToTableData(iRow)
-        rowData.$sourceIndex = rtn._rows.length - 1;      
-        rowData.edit = iRow.edit;
-        rowData.delete = iRow.delete;
-        rtn._tableData.push(rowData);
+        // let rowData = rtn.rowsItemToTableData(iRow)
+        // rowData.$sourceIndex = rtn._rows.length - 1;      
+        // rowData.edit = iRow.edit;
+        // rowData.delete = iRow.delete;
+        // rtn._tableData.push(rowData);
+      }
+    },
+    delRow(row) {
+      debugger
+      if(row && rtn.primaryKeys && rtn.primaryKeys.length>0){
+        rtn.rows.forEach((row,i) => {
+          debugger
+          console.log(row)
+
+        });
       }
     },
   };

package/src/centaline/loader/src/ctl/InputNumber.js

@@ -19,9 +19,6 @@ const box = function (source, callBack) {
       },
       set clearable(v) {
         source.clear = v;
-      },      
-      get decimals() {
-        return data.decimals1;
       },
       get value() {
         return source.code1;

package/src/centaline/loader/src/ctl/RichText.js

@@ -16,6 +16,9 @@ const RichText = function (source, router) {
     get action() {
       return router &&router.action ? router.action : "";//上传完整地址
     },
+    set action(v) {
+      source.action = v;
+    },
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

package/src/centaline/loader/src/ctl/Router.js

@@ -149,7 +149,7 @@ const Router = function (source) {
       return source.imgUrl;
     },
     get rightField() {
-      return common.initialsToUpperCase(source.rightField);
+      return common.initialsToLowerCase(source.rightField);
     },
     get submitFormField() {
      
@@ -158,7 +158,7 @@ const Router = function (source) {
       }
       var submitArr = [];
       source.refFieldName.split(',').forEach(v => {
-        submitArr.push(common.initialsToUpperCase(v));
+        submitArr.push(common.initialsToLowerCase(v));
       })
       return submitArr;
     },
@@ -168,7 +168,7 @@ const Router = function (source) {
       }
       var submitArr = [];
       source.refFieldName.split(',').forEach(v => {
-        submitArr.push(common.initialsToUpperCase(v));
+        submitArr.push(common.initialsToLowerCase(v));
       })
       return submitArr;
     },

package/src/centaline/loader/src/ctl/SearchScreen.js

@@ -204,28 +204,28 @@ const SearchScreen = function (source, callBack, screenPara) {
         }
         return result;
       },
-       // 1 是字符串 2是数字
-       getDataType(searchDataType)
-       {
-         let dataType=1;
-         switch(searchDataType)
-         {
-           case 2:
-           case 6:
-            dataType=2;
-             break;
-            case 1:
-            case 3:
-            case 4:
-            case 5:
-               dataType=1;
-                break;
-           default:
-                dataType=1;
-               break; 
-         }
-         return dataType;
-       },
+      // 1 是字符串 2是数字
+      getDataType(searchDataType)
+      {
+        let dataType=1;
+        switch(searchDataType)
+        {
+          case 2:
+          case 6:
+          dataType=2;
+            break;
+          case 1:
+          case 3:
+          case 4:
+          case 5:
+              dataType=1;
+              break;
+          default:
+              dataType=1;
+              break; 
+        }
+        return dataType;
+      },
       initScreen(screens) {
         var rtnscreens = [];