【深爱】【主表 多选放大镜】

uas-office-web/uas-mobile/src/utils/common/form.request.js

@@ -62,7 +62,7 @@ export function analysisFormData (formData, isDetail) {
 export function getBillGroup (groupItem, groupIndex, isDetail) {
   let billGroup = new BillGroupModel()
   billGroup.group = groupItem.groupTitle
-  billGroup.isForm = groupItem.isForm
+  billGroup.isForm = (groupItem.isForm==undefined) ? true:groupItem.isForm;
   billGroup.keyField = groupItem.keyField
   billGroup.billCaller = groupItem.groupCaller
   billGroup.groupIndex = groupIndex
@@ -86,21 +86,20 @@ export function getBillGroup (groupItem, groupIndex, isDetail) {
 
       billModel.type = fieldItem.type//前端类型
       billModel.sourcetype = fieldItem.sourcetype//字段原类型
-      if (billModel.type === 'MF'){
+      if (fieldItem.type === 'MF'){
         var billModel_aa = billModel;
         var billGroup_aa = billGroup;
-        console.log("getBillGroup-1:",billModel_aa,billGroup_aa);
+        console.log("getBillGroup-1:",billModel_aa,billGroup_aa,fieldItem);
       }
-      if (billModel.type === 'MF' && !billGroup.isForm) {
-        debugger;
+      if (billModel.type === 'MF' && isDetail) {
         //移动端不支持从表的放大镜多选类型
         //将多选类型识别为放大镜单选类型
         billModel.type = 'DF'
       }
-      if (billModel.type === 'MF'){
+      if (fieldItem.type === 'MF'){
         var billModel_bb = billModel;
         var billGroup_bb = billGroup;
-        console.log("getBillGroup-2:",billModel_bb,billGroup_bb);
+        console.log("getBillGroup-2:",billModel_bb,billGroup_bb,fieldItem);
       }
       billModel.value = fieldItem.value
       billModel.display = fieldItem.display