待办列表添加内容预览

IFS/IFS/Main/Business/Todo/Controller/TodoViewController.swift

@@ -90,34 +90,14 @@ class TodoViewController: BaseTableViewPullController {
                 let lindanVC = HomeLinDanController.instantiateViewController(.Function) as! HomeLinDanController
                 lindanVC.model = model
                 pushVC(lindanVC)
-//                ShowAlertView(hint, "请确认是否领单?", [cancel,sure], .alert, {[weak self] (index) in
-//                    if index == kZERO { return }
-//                    self?.orderDetailViewModel.getChildBillAction(model.entityUuid).subscribe(onNext: { () in
-//                        self?.loadDataWhenDraw()
-//                        ShowMessage("领取成功")
-//                        Network.request(target: Service.ChildOrderComplete(model.entityUuid, "drew"), success: { (json) in
-//
-//                        }, failure: { (error) in
-//
-//                        })
-//                    }).disposed(by: self!.disposeBag)
-//                })
                 break
             case TODO_STATE.DREW:
-//                if !PermissionsManager.saveChildPermissions() {
-//                    ShowMessage("当前用户对此工单没有编辑权限!")
-//                    return;
-//                }
                 let childBillVc = RepairOrderEditSonOrderViewController.instantiateViewController(.Function) as! RepairOrderEditSonOrderViewController
                 childBillVc.billModel = BillDetailExecute(fromJson: JSON(model.toDictionary()))
                 childBillVc.billModel.uuid = model.entityUuid
                 pushVC(childBillVc)
                 break
             case TODO_STATE.PROCESSING:
-//                if !PermissionsManager.childViewPermissions() {
-//                    ShowMessage("当前用户对此工单没有查看权限!")
-//                    return;
-//                }
                 let childBillVc = RepairOrderChildBillDetailViewController.instantiateViewController(.Function) as! RepairOrderChildBillDetailViewController
                 childBillVc.billModel = BillDetailExecute(fromJson: JSON(model.toDictionary()))
                 childBillVc.billModel.uuid = model.entityUuid

IFS/IFS/Main/Business/Todo/View/TodoTableViewCell.swift

@@ -10,7 +10,8 @@ import UIKit
 
 class TodoTableViewCell: UITableViewCell {
 
-    
+    /// 内容
+    @IBOutlet weak var contentLabel: UILabel!
     /// 标题 + code
     @IBOutlet weak var titleCodeLabel: UILabel!
     /// 操作时间
@@ -34,6 +35,7 @@ class TodoTableViewCell: UITableViewCell {
         }
         operationDateLabel.text = String(format: "%@", model.createTime)
         todoStateLabel.text = model.workState.getStateString()
+        contentLabel.text = model.content
     }
 
 }

IFS/IFS/Main/Home/Controller/HomeTableViewController.swift

@@ -72,9 +72,9 @@ class HomeTableViewController: BaseTableViewPullController {
         return todoViewModel.todoResultArray.count
     }
     
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 60
-    }
+//    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+//        return 60
+//    }
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
@@ -96,21 +96,12 @@ class HomeTableViewController: BaseTableViewPullController {
                 pushVC(lindanVC)
                 break
             case TODO_STATE.DREW:
-                
-//                if !PermissionsManager.saveChildPermissions() {
-//                    ShowMessage("当前用户对此工单没有编辑权限!")
-//                    return;
-//                }
                 let childBillVc = RepairOrderEditSonOrderViewController.instantiateViewController(.Function) as! RepairOrderEditSonOrderViewController
                 childBillVc.billModel = BillDetailExecute(fromJson: JSON(model.toDictionary()))
                 childBillVc.billModel.uuid = model.entityUuid
                 pushVC(childBillVc)
                 break
             case TODO_STATE.PROCESSING:
-//                if !PermissionsManager.childViewPermissions() {
-//                    ShowMessage("当前用户对此工单没有查看权限!")
-//                    return;
-//                }
                 let childBillVc = RepairOrderChildBillDetailViewController.instantiateViewController(.Function) as! RepairOrderChildBillDetailViewController
                 childBillVc.billModel = BillDetailExecute(fromJson: JSON(model.toDictionary()))
                 childBillVc.billModel.uuid = model.entityUuid

IFS/IFS/Main/Home/View/HomeTableViewCell.swift

@@ -9,7 +9,8 @@
 import UIKit
 
 class HomeTableViewCell: UITableViewCell {
-
+    /** 内容 */
+    @IBOutlet weak var contentLabel: UILabel!
     /// 部门（代码）
     @IBOutlet weak var departmentLabel: UILabel!
     /// 单据时间
@@ -28,6 +29,7 @@ class HomeTableViewCell: UITableViewCell {
             departmentLabel.text = model.dept.name + titleString
         }
         orderTimeLabel.text = String(format: "创建时间：%@", model.createTime)
+        contentLabel.text = model.content
     }
 
 }

IFS/IFS/Resource/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.7</string>
+	<string>1.1.9</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.7</string>
+	<string>1.1.9</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>