no message

IFS/IFS.xcodeproj/project.pbxproj

@@ -1394,7 +1394,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 2G3393EZPN;
+				DEVELOPMENT_TEAM = W54V2VB863;
 				INFOPLIST_FILE = "$(SRCROOT)/IFS/Resource/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1415,7 +1415,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 2G3393EZPN;
+				DEVELOPMENT_TEAM = W54V2VB863;
 				INFOPLIST_FILE = "$(SRCROOT)/IFS/Resource/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderAddViewModel.swift

@@ -352,11 +352,12 @@ extension RepairOrderAddViewModel {
                     let deviceModel = result[index!]
                     let choiceModel = choices.first!
                     controller.deviceTitleLabel.text = choiceModel.title
+                    if deviceModel.position != nil {
                         controller.deviceLocationLabel.text = deviceModel.position.name
+                    }
                     controller.deviceTitleLabel.textColor = kBlackColor
                     controller.deviceLocationLabel.textColor = kBlackColor
-                    let model = result[index!]
-                    let device = UCN(model.code, model.name, model.uuid)
+                    let device = UCN(deviceModel.code, deviceModel.name, deviceModel.uuid)
                     self?.saveOrderModel.device = device
                 })
                 controller.pushVC(publicFilterVc)

IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderDetailViewModel.swift

@@ -210,7 +210,11 @@ extension RepairOrderDetailViewModel {
     func billDetailAssignment(_ controller: RepairOrderDetailViewController) {
         var source: String?
         if billDetailModel.source == "租区"  {
+            if billDetailModel.tenant != nil {
                 source = String(format: "%@，商户: (%@)", billDetailModel.source,billDetailModel.tenant.name)
+            }else {
+                source = String(format: "%@，商户: ---", billDetailModel.source)
+            }
         }else {
             source = String(format: "%@", billDetailModel.source)
         }
@@ -233,7 +237,6 @@ extension RepairOrderDetailViewModel {
         if billDetailModel.position != nil {
             controller.positionLabel.text = disposeEmpty(billDetailModel.position.name)
         }
-        controller.deviceLocationLab.text = disposeEmpty(billDetailModel.deviceadree)
         controller.descriptionLab.text = disposeEmpty(billDetailModel.descriptionField)
         controller.billNumberLab.text = billDetailModel.workNo
         controller.isSolveLabel.text = billDetailModel.finish ? "是" : "否"