diff --git a/IFS/IFS/Appdelegate+Extension.swift b/IFS/IFS/Appdelegate+Extension.swift
index 7fb97080fc774d2c886d01395095d45a0ba16658..bfee1c96025af4e41121e115d80444cfcba8dfbd 100644
--- a/IFS/IFS/Appdelegate+Extension.swift
+++ b/IFS/IFS/Appdelegate+Extension.swift
@@ -33,8 +33,6 @@ extension AppDelegate:JPUSHRegisterDelegate{
guard notification.userInfo != nil else {
return
}
- let userInfo = notification.userInfo!["extras"]
-// SBSkipTool.share.skipViewController(parameters: userInfo as? [AnyHashable : Any])
}
func registerPush(launchOptions: [UIApplicationLaunchOptionsKey: Any]?){
NotificationCenter.default.addObserver(self, selector: #selector(networkDidReceiveMessage(notification:)), name: NSNotification.Name.jpfNetworkDidReceiveMessage, object: nil)
diff --git a/IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderDetailViewController.swift b/IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderDetailViewController.swift
index 09c7f742b5cde0f1add8760b322ec9c3e6eadd44..a408b4a223dde927bb2da99bde66e94062b8940f 100644
--- a/IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderDetailViewController.swift
+++ b/IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderDetailViewController.swift
@@ -60,6 +60,7 @@ class RepairOrderDetailViewController: BaseTableViewController {
//æ¡å½¢ç
@IBOutlet weak var codeImageView: UIImageView!
@IBOutlet weak var codeLabel: UILabel!
+ @IBOutlet weak var drawOrderPerson: UILabel!
/// 附件宽度
let imageWidth = ((kWidth - 90) - CGFloat((3 + kONE) * 5)) / 3
/// å·¥å•çŠ¶æ€å›žè°ƒ
diff --git a/IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderDetailViewModel.swift b/IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderDetailViewModel.swift
index 7c9f6e73ce40c6d4a8ccbf08ad9ab2bc2836bc2f..684fae81bbafd53dbfd07a013444236d799ccbbb 100644
--- a/IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderDetailViewModel.swift
+++ b/IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderDetailViewModel.swift
@@ -246,6 +246,15 @@ extension RepairOrderDetailViewModel {
}
controller.codeImageView.image = LBXScanWrapper.createCode128(codeString: billDetailModel.workNo, size: CGSize(width: kWidth - 120, height: 80), qrColor: UIColor.black, bkColor: UIColor.white)
controller.codeLabel.text = billDetailModel.workNo
+ if billDetailModel.executes != nil{
+ controller.drawOrderPerson.text = billDetailModel.executes!.map { (model) -> String in
+ if model.owner != nil{
+ return model.owner.name
+ }else{
+ return ""
+ }
+ }.joined(separator: ",")
+ }
}
// MARK: - 处ç†ç©ºæ•°æ®
diff --git a/IFS/IFS/Main/Storyboards/Function.storyboard b/IFS/IFS/Main/Storyboards/Function.storyboard
index 84becfc3ce262d27d7cf69d0c4d9b38597ffe498..c500a258dc30621dde8e0be88d4e23893a1cbc93 100644
--- a/IFS/IFS/Main/Storyboards/Function.storyboard
+++ b/IFS/IFS/Main/Storyboards/Function.storyboard
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="isT-BW-hRq">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="isT-BW-hRq">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
- <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -223,35 +222,35 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lQ2-Am-1M3">
- <rect key="frame" x="60" y="35" width="255" height="1"/>
+ <rect key="frame" x="60" y="35.5" width="255" height="1"/>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="rXb-UC-5Fi"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="hPh-1i-LfN">
- <rect key="frame" x="60" y="30.5" width="10" height="10"/>
+ <rect key="frame" x="60" y="31" width="10" height="10"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="nIc-Ck-mKb">
- <rect key="frame" x="182.5" y="30.5" width="10" height="10"/>
+ <rect key="frame" x="182.5" y="31" width="10" height="10"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="1Vg-nO-Rsk">
- <rect key="frame" x="305" y="30.5" width="10" height="10"/>
+ <rect key="frame" x="305" y="31" width="10" height="10"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·²å‘出" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gRy-pu-9Bq">
- <rect key="frame" x="45.5" y="50.5" width="40" height="16"/>
+ <rect key="frame" x="45" y="51" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="处ç†ä¸" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0HP-jr-VQ3">
- <rect key="frame" x="167.5" y="50.5" width="40" height="16"/>
+ <rect key="frame" x="167.5" y="51" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已完æˆ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ybu-pP-YQz">
- <rect key="frame" x="290" y="50.5" width="40" height="16"/>
+ <rect key="frame" x="290" y="51" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -767,15 +766,45 @@
</constraints>
</tableViewCellContentView>
</tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="30" id="Ap3-XH-i26">
+ <rect key="frame" x="0.0" y="754" width="375" height="30"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Ap3-XH-i26" id="Vz5-Oh-DEE">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="领å•äºº" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5PG-sv-ROn">
+ <rect key="frame" x="15" y="7" width="40" height="16"/>
+ <fontDescription key="fontDescription" type="system" pointSize="13"/>
+ <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gR-cx-t2K">
+ <rect key="frame" x="90" y="5" width="18.5" height="19.5"/>
+ <fontDescription key="fontDescription" type="system" pointSize="13"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <constraints>
+ <constraint firstItem="1gR-cx-t2K" firstAttribute="top" secondItem="Vz5-Oh-DEE" secondAttribute="top" constant="5" id="4sI-Xd-4gR"/>
+ <constraint firstItem="5PG-sv-ROn" firstAttribute="leading" secondItem="Vz5-Oh-DEE" secondAttribute="leading" constant="15" id="5RY-Ap-b6W"/>
+ <constraint firstItem="1gR-cx-t2K" firstAttribute="centerY" secondItem="5PG-sv-ROn" secondAttribute="centerY" id="8nt-XE-wuh"/>
+ <constraint firstAttribute="bottom" secondItem="1gR-cx-t2K" secondAttribute="bottom" constant="5" id="Xzw-sl-AKq"/>
+ <constraint firstItem="5PG-sv-ROn" firstAttribute="centerY" secondItem="Vz5-Oh-DEE" secondAttribute="centerY" id="Z6e-Cs-u7Q"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1gR-cx-t2K" secondAttribute="trailing" constant="15" id="h6b-3b-frf"/>
+ <constraint firstItem="1gR-cx-t2K" firstAttribute="leading" secondItem="Vz5-Oh-DEE" secondAttribute="leading" constant="90" id="qke-LC-TLl"/>
+ </constraints>
+ </tableViewCellContentView>
+ </tableViewCell>
</cells>
</tableViewSection>
<tableViewSection id="akT-8B-cQA">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="29" id="IUa-aa-hAd">
- <rect key="frame" x="0.0" y="773" width="375" height="29"/>
+ <rect key="frame" x="0.0" y="803" width="375" height="29"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IUa-aa-hAd" id="J6d-Ag-3qs">
- <rect key="frame" x="0.0" y="0.0" width="375" height="28.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="29"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
@@ -784,10 +813,10 @@
<tableViewSection id="V4Z-o2-h72">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="30" id="loi-eF-sJs">
- <rect key="frame" x="0.0" y="821" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="851" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="loi-eF-sJs" id="mKu-Yo-W9j">
- <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是å¦è§£å†³" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q3e-xL-CIB">
@@ -812,10 +841,10 @@
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="30" id="AlH-ca-Eok">
- <rect key="frame" x="0.0" y="851" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="881" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="AlH-ca-Eok" id="md0-YE-7LW">
- <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="完æˆæƒ…况" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xUy-aT-74a">
@@ -861,6 +890,7 @@
<outlet property="descriptionLab" destination="kFe-Eg-mY4" id="XHf-EY-fcR"/>
<outlet property="deviceLab" destination="C0r-ij-6zA" id="5qG-Su-pP1"/>
<outlet property="deviceLocationLab" destination="IXa-tu-bb6" id="EYs-6U-JsH"/>
+ <outlet property="drawOrderPerson" destination="1gR-cx-t2K" id="0en-dc-sgm"/>
<outlet property="isSolveLabel" destination="rps-Bp-swV" id="JTB-BI-Qmr"/>
<outlet property="phoneLab" destination="BcA-yM-ArB" id="I3m-8Q-STn"/>
<outlet property="positionLabel" destination="4YN-xv-6aj" id="N8J-xW-27H"/>
@@ -900,7 +930,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·¥å•æ¡å½¢ç " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WeG-fd-nfQ">
- <rect key="frame" x="15" y="40.5" width="76.5" height="18"/>
+ <rect key="frame" x="15" y="41" width="76.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="highlightedColor"/>
</label>
@@ -939,7 +969,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ydb-sI-bkr">
- <rect key="frame" x="298" y="13" width="43" height="17"/>
+ <rect key="frame" x="298" y="13.5" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -966,7 +996,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bE6-Qw-QEO">
- <rect key="frame" x="298" y="13" width="43" height="17"/>
+ <rect key="frame" x="298" y="13.5" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -1027,7 +1057,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kqE-cM-5ea">
- <rect key="frame" x="298" y="13" width="43" height="17"/>
+ <rect key="frame" x="298" y="13.5" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -1054,7 +1084,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tvt-Ul-7AV">
- <rect key="frame" x="298" y="13" width="43" height="17"/>
+ <rect key="frame" x="298" y="13.5" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -1081,7 +1111,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nlm-KX-6Dt">
- <rect key="frame" x="298" y="13" width="43" height="17"/>
+ <rect key="frame" x="298" y="13.5" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -1108,7 +1138,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ddk-0h-yNr">
- <rect key="frame" x="298" y="13" width="43" height="17"/>
+ <rect key="frame" x="298" y="13.5" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -1349,35 +1379,35 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S7q-9y-p9h">
- <rect key="frame" x="60" y="35" width="255" height="1"/>
+ <rect key="frame" x="60" y="35.5" width="255" height="1"/>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="zP3-6T-bLc"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="Oka-Ih-0e2">
- <rect key="frame" x="60" y="30.5" width="10" height="10"/>
+ <rect key="frame" x="60" y="31" width="10" height="10"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="fcu-eo-YQV">
- <rect key="frame" x="182.5" y="30.5" width="10" height="10"/>
+ <rect key="frame" x="182.5" y="31" width="10" height="10"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="b3d-A7-D4l">
- <rect key="frame" x="305" y="30.5" width="10" height="10"/>
+ <rect key="frame" x="305" y="31" width="10" height="10"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·²å‘出" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zIH-mp-QRx">
- <rect key="frame" x="45.5" y="50.5" width="40" height="16"/>
+ <rect key="frame" x="45" y="51" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="处ç†ä¸" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Aw7-24-uzj">
- <rect key="frame" x="167.5" y="50.5" width="40" height="16"/>
+ <rect key="frame" x="167.5" y="51" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已完æˆ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uvD-Va-VzJ">
- <rect key="frame" x="290" y="50.5" width="40" height="16"/>
+ <rect key="frame" x="290" y="51" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -1802,7 +1832,7 @@
<rect key="frame" x="0.0" y="667" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="efL-P2-VKU" id="YxL-XB-DEk">
- <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="物料" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jL5-3O-joH">
@@ -1834,7 +1864,7 @@
<rect key="frame" x="0.0" y="716" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4hD-dy-731" id="a8C-4e-dbO">
- <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设备" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2wv-If-noc">
@@ -1866,7 +1896,7 @@
<rect key="frame" x="0.0" y="765" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7Fp-0f-IYI" id="Jfz-sF-9Tl">
- <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="æè¿°" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="myO-ts-7u2">
@@ -1894,7 +1924,7 @@
<rect key="frame" x="0.0" y="795" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Yi0-b3-qsy" id="NbB-bS-p55">
- <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ç»´ä¿®å‰" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c4Q-fz-lZB">
@@ -1914,7 +1944,7 @@
<rect key="frame" x="0.0" y="825" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pSt-Qa-R0r" id="7vk-cD-b7I">
- <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ç»´ä¿®åŽ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ob1-8K-Tch">
@@ -1986,13 +2016,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="物料" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t5K-3T-7x5">
- <rect key="frame" x="15" y="13.5" width="27" height="16"/>
+ <rect key="frame" x="15" y="14" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MVT-jv-EoZ">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2014,13 +2044,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å•ä»·(å…ƒ)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ruE-GO-heG">
- <rect key="frame" x="15" y="13.5" width="50" height="16"/>
+ <rect key="frame" x="15" y="14" width="50" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Aim-BY-9Sr">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2042,13 +2072,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="æ•°é‡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qm1-Fh-NhF">
- <rect key="frame" x="15" y="13.5" width="27" height="16"/>
+ <rect key="frame" x="15" y="14" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jCy-Tl-b8i">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2070,13 +2100,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åˆè®¡(å…ƒ)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3rE-Gn-oez">
- <rect key="frame" x="15" y="13.5" width="50" height="16"/>
+ <rect key="frame" x="15" y="14" width="50" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pfc-Ur-zcg">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2098,13 +2128,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="æå–æ•°é‡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rcb-XI-n5u">
- <rect key="frame" x="15" y="13.5" width="54" height="16"/>
+ <rect key="frame" x="15" y="14" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WwH-cy-fC0">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2126,13 +2156,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="退料数é‡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hpD-6A-QfH">
- <rect key="frame" x="15" y="13.5" width="54" height="16"/>
+ <rect key="frame" x="15" y="14" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VrQ-JA-3ot">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2186,13 +2216,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设备" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YZL-yK-vRs">
- <rect key="frame" x="15" y="13.5" width="27" height="16"/>
+ <rect key="frame" x="15" y="14" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fqo-TS-Qoo">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2214,13 +2244,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="借用å•å•å·" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sZx-l5-1vB">
- <rect key="frame" x="15" y="13.5" width="67" height="16"/>
+ <rect key="frame" x="15" y="14" width="67" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ofR-0l-gUP">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2242,13 +2272,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="借用数é‡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Wq-gl-TJX">
- <rect key="frame" x="15" y="13.5" width="54" height="16"/>
+ <rect key="frame" x="15" y="14" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D3Q-Z4-x3R">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2270,13 +2300,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="归还数é‡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CAC-5c-zqN">
- <rect key="frame" x="15" y="13.5" width="54" height="16"/>
+ <rect key="frame" x="15" y="14" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bC7-sz-0jB">
- <rect key="frame" x="341.5" y="13.5" width="18.5" height="16"/>
+ <rect key="frame" x="341.5" y="14" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2335,7 +2365,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="内部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NQX-bW-r0y">
- <rect key="frame" x="15" y="111.5" width="27" height="16"/>
+ <rect key="frame" x="15" y="111" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -2359,7 +2389,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高优先级" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ggv-3t-kmY">
- <rect key="frame" x="15" y="78.5" width="54" height="16"/>
+ <rect key="frame" x="15" y="78" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -2372,7 +2402,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9wi-qR-pDc">
- <rect key="frame" x="15" y="102.5" width="360" height="1"/>
+ <rect key="frame" x="15" y="102" width="360" height="1"/>
<color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="bCd-L6-jEf"/>
@@ -2386,13 +2416,13 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="2018年01月03日10:46:18" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hGq-MW-rnO">
- <rect key="frame" x="55" y="55.5" width="153" height="16"/>
+ <rect key="frame" x="55" y="55" width="153" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="å•å·ï¼š121831313173717317" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Soh-xE-V9D">
- <rect key="frame" x="193" y="111.5" width="167" height="16"/>
+ <rect key="frame" x="193" y="111" width="167" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -2451,7 +2481,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g00-fd-O9b">
- <rect key="frame" x="10" y="15.5" width="76.5" height="30"/>
+ <rect key="frame" x="10" y="15" width="76.5" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="D8x-2E-p8T"/>
</constraints>
@@ -2464,7 +2494,7 @@
</state>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QlY-ZU-0hW">
- <rect key="frame" x="91.5" y="15.5" width="76" height="30"/>
+ <rect key="frame" x="91.5" y="15" width="76" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<state key="normal" title="全部状æ€" image="arrow_bottom">
<color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -2474,7 +2504,7 @@
</state>
</button>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hiE-ch-6eZ">
- <rect key="frame" x="172.5" y="15.5" width="76.5" height="30"/>
+ <rect key="frame" x="172.5" y="15" width="76.5" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<state key="normal" title="全部æ¥æº" image="arrow_bottom">
<color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -2484,7 +2514,7 @@
</state>
</button>
<button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nPQ-vE-p31">
- <rect key="frame" x="254" y="15.5" width="76" height="30"/>
+ <rect key="frame" x="254" y="15" width="76" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<state key="normal" title="全部优先级" image="arrow_bottom">
<color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -2927,7 +2957,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择项目" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jo2-H4-XNf">
- <rect key="frame" x="283.5" y="13" width="57.5" height="17"/>
+ <rect key="frame" x="283.5" y="13.5" width="57.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -2954,7 +2984,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工程å‘èµ·æ–¹" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kjh-Ep-jMW">
- <rect key="frame" x="269.5" y="13" width="71.5" height="17"/>
+ <rect key="frame" x="269.5" y="13.5" width="71.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -2981,7 +3011,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择商户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfD-VE-rVl">
- <rect key="frame" x="283.5" y="13" width="57.5" height="17"/>
+ <rect key="frame" x="283.5" y="13.5" width="57.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3009,7 +3039,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·¥å•æœåŠ¡ç±»åž‹" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FlM-wv-NnY">
- <rect key="frame" x="255" y="13" width="86" height="17"/>
+ <rect key="frame" x="255" y="13.5" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3037,7 +3067,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·¥å•ç´§æ€¥ç¨‹åº¦" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BHT-7E-L9t">
- <rect key="frame" x="255" y="13" width="86" height="17"/>
+ <rect key="frame" x="255" y="13.5" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3065,7 +3095,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择报事人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uew-aE-Bpk">
- <rect key="frame" x="269.5" y="13" width="72" height="17"/>
+ <rect key="frame" x="269" y="13.5" width="72" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3125,7 +3155,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·¥å•æŽ¥æŠ¥æ—¶é—´" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7V7-W8-vDD">
- <rect key="frame" x="255" y="13" width="86" height="17"/>
+ <rect key="frame" x="255" y="13.5" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3153,7 +3183,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·¥å•æŒ‡å®šæ—¶é—´" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wXh-S9-xUl">
- <rect key="frame" x="255" y="13" width="86" height="17"/>
+ <rect key="frame" x="255" y="13.5" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3181,7 +3211,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å·¥å•æŒ‡å®šä½ç½®" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aaN-lY-03E">
- <rect key="frame" x="255" y="13" width="86" height="17"/>
+ <rect key="frame" x="255" y="13.5" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3238,7 +3268,7 @@
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="3eR-qR-Yth">
- <rect key="frame" x="306" y="7" width="51" height="31"/>
+ <rect key="frame" x="306" y="6.5" width="51" height="31"/>
<color key="onTintColor" red="0.21755459899999999" green="0.53306800129999998" blue="0.99824184179999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</switch>
</subviews>
@@ -3267,7 +3297,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择故障设施" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DNT-zw-QBe">
- <rect key="frame" x="255" y="13" width="86" height="17"/>
+ <rect key="frame" x="255" y="13.5" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3321,13 +3351,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="故障时间" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bRC-xA-vEC">
- <rect key="frame" x="15" y="12.5" width="62" height="18"/>
+ <rect key="frame" x="15" y="13" width="62" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设施故障时间" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cWq-pB-V59">
- <rect key="frame" x="263" y="12.5" width="86" height="17"/>
+ <rect key="frame" x="263" y="13.5" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3505,55 +3535,55 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="处ç†ä¸" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y3X-ul-s80">
- <rect key="frame" x="168" y="73" width="40" height="16"/>
+ <rect key="frame" x="167.5" y="72.5" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_selected" translatesAutoresizingMaskIntoConstraints="NO" id="p2z-NQ-RzI">
- <rect key="frame" x="46" y="39" width="24" height="24"/>
+ <rect key="frame" x="46" y="38.5" width="24" height="24"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未派å•" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="meU-ii-6B2">
- <rect key="frame" x="38" y="73" width="40" height="16"/>
+ <rect key="frame" x="38" y="72.5" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" red="0.40392156862745099" green="0.59215686274509804" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å•å·ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I0s-tT-7rj">
- <rect key="frame" x="20" y="109" width="40" height="16"/>
+ <rect key="frame" x="20" y="108.5" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLp-MH-lE3">
- <rect key="frame" x="60" y="109" width="18.5" height="16"/>
+ <rect key="frame" x="60" y="108.5" width="18.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已完æˆ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5cj-UO-UhP">
- <rect key="frame" x="290" y="73" width="40" height="16"/>
+ <rect key="frame" x="290" y="72.5" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="th0-Wr-esg">
- <rect key="frame" x="183" y="46" width="10" height="10"/>
+ <rect key="frame" x="182.5" y="45.5" width="10" height="10"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="state_default" translatesAutoresizingMaskIntoConstraints="NO" id="vwB-GB-hNa">
- <rect key="frame" x="305" y="46" width="10" height="10"/>
+ <rect key="frame" x="305" y="45.5" width="10" height="10"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hyd-rL-nXx">
- <rect key="frame" x="0.0" y="135" width="375" height="25"/>
+ <rect key="frame" x="0.0" y="134.5" width="375" height="25"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="创建" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rtO-Hu-JUO">
- <rect key="frame" x="20" y="4" width="27" height="16"/>
+ <rect key="frame" x="20" y="4.5" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018-09-09 23:23:23" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6O4-zj-dFr">
- <rect key="frame" x="221" y="4" width="134" height="16"/>
+ <rect key="frame" x="221" y="4.5" width="134" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -3625,16 +3655,16 @@
</scenes>
<resources>
<image name="add_order" width="49" height="49"/>
- <image name="add_photo" width="144" height="93"/>
+ <image name="add_photo" width="144" height="93.5"/>
<image name="arrow_bottom" width="8" height="5"/>
<image name="arrow_bottom_blue" width="8" height="5"/>
<image name="bill_completed_state" width="22" height="22"/>
<image name="bill_completed_state_selected" width="22" height="22"/>
<image name="delete" width="22" height="22"/>
- <image name="location" width="64" height="64"/>
+ <image name="location" width="128" height="128"/>
<image name="state_default" width="10" height="10"/>
<image name="state_selected" width="24" height="24"/>
- <image name="todo_icon" width="23" height="24"/>
+ <image name="todo_icon" width="23.5" height="24.5"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="ui0-ve-aBK"/>