Merge remote-tracking branch 'origin/branch_qywx_v2' into branch_qywx_v2

uas-office-web/uas-mobile/src/components/common/currencyDetail/CurrencyDetail.jsx

@@ -963,7 +963,6 @@ class CurrencyDetail extends Component {
 
   onSubmitClick = () => {
     const { billGroupList } = this.state
-    console.log(billGroupList)
     if (!isObjEmpty(billGroupList)) {
       let formFields = [], gridGroupFields = []
       for (let i = 0; i < billGroupList.length; i++) {

uas-office-web/uas-mobile/src/components/common/formNew/FormEnclosure.jsx

@@ -158,7 +158,6 @@ export default class FormEnclosure extends Component {
           }
         })
       }
-      console.log(fileList)
       billModel.fileList = fileList
       this.setState({ billModel })
       onTextChange && onTextChange(groupIndex, childIndex, value)

uas-office-web/uas-mobile/src/components/common/formNew/FormInput.jsx

@@ -97,13 +97,9 @@ export default class FormInput extends Component {
         this.getTextCom(billModel)
     }
     return (
-        (billIsDateSingle(billModel)||billIsMap(billModel)) ? <div>
-          {valueItem}
-        </div> :
-        billIsMultiLine(billModel) ? (this.renderTwoLines(
-          billModel,
-          valueItem)) :
-          (this.renderNormal(billModel, valueItem, modalOpen, modalList))
+        (billIsDateSingle(billModel)||billIsMap(billModel)) ? <div>{valueItem}</div> :
+          billIsMultiLine(billModel) ? (this.renderTwoLines(billModel,valueItem))
+              : (this.renderNormal(billModel, valueItem, modalOpen, modalList))
     )
   }
 
@@ -481,7 +477,6 @@ export default class FormInput extends Component {
 
   onInputClick = e => {
     const { billModel } = this.state
-    console.log(billModel)
     if (billIsSelect(billModel) && !billModel.readOnly) {
       if (billIsDateRange(billModel)) {
         this.setState({

uas-office-web/uas-mobile/src/components/common/mainHeader/MainHeader.jsx

@@ -19,25 +19,24 @@ class MainHeader extends Component {
     this.state = {
       homeHeaderIcon: [
         {
+          'name': '我的待办',//待审批
+          countUrl: API.APPCOMMON_COUNT + 'processToDo.action',
+          icon: 'uas-home-approval',
+        },{
           'name': '我的日程',
           countUrl: API.APPCOMMON_COUNT + 'dailyTask.action',
           icon: 'uas-home-schedule',
         },
         {
-          'name': '待审批',
-          countUrl: API.APPCOMMON_COUNT + 'processToDo.action',
-          icon: 'uas-home-approval',
+          'name': '我的订阅',
+          countUrl: API.APPCOMMON_COUNT + 'subscribe.action',
+          icon: 'uas-home-subscribe',
         },
         {
-          'name': '任务',
+          'name': '我的任务',//任务
           countUrl: API.APPCOMMON_COUNT + 'taskToDo.action',
           icon: 'uas-home-task',
         },
-        {
-          'name': '我的订阅',
-          countUrl: API.APPCOMMON_COUNT + 'subscribe.action',
-          icon: 'uas-home-subscribe',
-        },
       ],
     }
   }
@@ -82,11 +81,11 @@ class MainHeader extends Component {
     //点击图标触发
     if (funcObj.name === '我的日程') {
       this.props.history.push('/schedulePage')
-    } else if (funcObj.name === '任务') {
+    } else if (funcObj.name === '我的任务') {
       this.props.history.push('/taskTodo')
     } else if (funcObj.name === '我的订阅') {
       this.props.history.push('/subscribeList')
-    } else if (funcObj.name === '待审批') {
+    } else if (funcObj.name === '我的待办') {
       this.props.history.push(
         '/approvalHome/' + this.props.userState.accountCode)
     }

uas-office-web/uas-mobile/src/components/private/profile/ProfileList.jsx

@@ -33,7 +33,7 @@ class ProfileList extends Component {
         <Item arrow="horizontal" extra={accountName} onClick={this.changeAccount}>切换账套</Item>
         {/* <Item arrow="horizontal">清除缓存</Item> */}
         <Item arrow="horizontal" onClick={this.userFeedback}>用户反馈</Item>
-        <Item arrow="horizontal" onClick={this.contactInfo}>关于我们</Item>
+        <Item arrow="horizontal" onClick={this.contactInfo}>关于优软</Item>
       </div>
     )
   }

uas-office-web/uas-mobile/src/model/common/BillModel.js

@@ -12,7 +12,7 @@ export default function BillModel (billModel) {
     this.dbfind = ''//是否是dbfind字段判定
     this.caption = ''//字段名称
     this.type = ''//类型(标题类型为Constants.TYPE_TITLE,不触发点击事件等 )
-    this.sourcetype = ''//字段原类型
+    this.sourceType = ''//字段原类型
     this.logicType = ''//logic类型
     this.readOnly = true//字段是否只读
     this.field = ''//字段
@@ -39,7 +39,7 @@ export default function BillModel (billModel) {
     this.dbfind = billModel.dbfind
     this.caption = billModel.caption
     this.type = billModel.type
-    this.sourcetype = billModel.sourcetype
+    this.sourceType = billModel.sourceType
     this.logicType = billModel.logicType
     this.readOnly = billModel.readOnly
     this.field = billModel.field

uas-office-web/uas-mobile/src/pages/private/approval/model/ApprovalBean.js

@@ -58,7 +58,7 @@ export default function ApprovalBean (type) {
 
   this.isDBFind = function () {
     return (this.dbFind == 'T' || this.dbFind == 'AT' || this.dbFind == 'M' ||
-      this.dbFind == 'DF')
+      this.dbFind == 'DF'||this.dbFind == 'MF')
   }
 
   this.setOldSelectValues = function () {

uas-office-web/uas-mobile/src/pages/private/approval/pages/Approval.jsx

@@ -1930,8 +1930,12 @@ class Approval extends Component {
       }
 
       approval.data2Values()
-      if ((!approval.neerInput && isObjEmpty(approval.values)) || !showAble
-        || approval.values == 'null' || approval.values == '(null)') {
+      if (approval.dfType!='FF' &&(
+          (!approval.neerInput && isObjEmpty(approval.values))
+          || !showAble
+          || approval.values == 'null'
+          || approval.values == '(null)'
+      )) {
         continue
       }
       if (mergeAble && !approval.isDBFind() && !approval.neerInput) {

uas-office-web/uas-mobile/src/pages/private/homePage/HomePage.jsx

@@ -165,7 +165,7 @@ class HomePage extends Component {
   getMineTab = () => {
     return (
       <TabBar.Item
-        title="我的"
+        title="我"
         key="Mine"
         icon={<UasIcon type="uas-mine-normal"/>}
         selectedIcon={<UasIcon type="uas-mine-select"/>}

uas-office-web/uas-mobile/src/pages/private/mine/ContactInfo.jsx

@@ -18,7 +18,7 @@ class ContactInfo extends Component {
   }
 
   componentDidMount () {
-    document.title = this.title || '关于我们'
+    document.title = this.title || '关于优软'
   }
 
   componentWillUnmount () {

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

@@ -62,11 +62,10 @@ 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
-
   let showBillFields = [], hideBillFields = []
   if (!isObjEmpty(groupItem.fieldList)) {
     groupItem.fieldList.forEach((fieldItem, filedIndex) => {
@@ -86,13 +85,20 @@ export function getBillGroup (groupItem, groupIndex, isDetail) {
       billModel.caption = fieldItem.caption
 
       billModel.type = fieldItem.type//前端类型
-      billModel.sourcetype = fieldItem.sourcetype//字段原类型
-      if (billModel.type === 'MF' && !billGroup.isForm) {
+      billModel.sourceType = fieldItem.sourceType//字段原类型
+      if (billModel.type === 'MF' && isDetail) {
         //移动端不支持从表的放大镜多选类型
         //将多选类型识别为放大镜单选类型
         billModel.type = 'DF'
       }
-
+      // CBG 视同多选放大镜
+      if (billModel.type === 'CBG') {
+        if(isDetail){
+          billModel.type = 'DF'
+        }else {
+          billModel.type = 'MF'
+        }
+      }
       billModel.value = fieldItem.value
       billModel.display = fieldItem.display
       billModel.defValue = fieldItem.defValue
@@ -106,8 +112,27 @@ export function getBillGroup (groupItem, groupIndex, isDetail) {
           }
         })
       }
-
-      //添加附件
+      //CBG 数据处理
+      if (billModel.value&&billModel.sourceType === 'CBG'&&billModel.logicType
+          && billModel.value.indexOf(";")>=0
+      ){
+        console.log(billModel.value,billModel.logicType);
+        var logicTypeList = billModel.logicType.split(";");
+        var cbgVList= billModel.value.split(";");
+        if(cbgVList.length === logicTypeList.length){
+          var cbgRealV = "";
+          cbgVList.forEach((cbgv,index) => {
+            if (String(cbgv) === '1') {
+              cbgRealV = cbgRealV+"#"+logicTypeList[index];
+            }
+          });
+          if(cbgRealV){
+            cbgRealV = cbgRealV.substring(1);
+          }
+          billModel.value = cbgRealV;
+        }
+      }
+          //添加附件
       let filePaths = fieldItem.filePaths
       if (billIsEnclosure(billModel)) {
         let fileList = []