diff --git a/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate b/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
index f5a80ffb038a56e2f5370898c7a29dfeebeed057..d9c8253c64be2232ee862f5b33d1b1a6b02d0d11 100644
Binary files a/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate and b/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.swift" "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.swift"
index 8be0bc3f0cb32606b855faaf00726a233374e45d..65d89660efd03d19ea5d7d54a64706f0ba96e6b9 100644
--- "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.swift"
+++ "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.swift"
@@ -50,9 +50,6 @@ class NewOnlyRKCell: UITableViewCell,UITextFieldDelegate {
func textFieldDidEndEditing(_ textField: UITextField) {
if isPurnNumber(str: textField.text!) {
delegate?.NewOnlyRKCellTFinput(text: textField.text!, inputType: textField.tag, cell: self)
- }else{
- HUD.flash(.label("请输入æ£ç¡®çš„æ•°å—"), delay: 1.2)
- textField.text = ""
}
}
func setYuanJiao2(sender:UIView){
diff --git "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.xib" "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.xib"
index d4ae8bca6f8dfa9412ca6d4960c36a80f24d02b9..a2c3536265789881c796addcc754072903534a30 100644
--- "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.xib"
+++ "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewOnlyRKCell.xib"
@@ -245,7 +245,8 @@
<constraint firstAttribute="width" constant="83" id="Dnk-eA-tTw"/>
<constraint firstAttribute="height" constant="32" id="zZC-ZH-Pwa"/>
</constraints>
- <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <color key="textColor" name="è“色å—体颜色"/>
+ <fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
diff --git "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewRKVc.swift" "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewRKVc.swift"
index 2c5cf57a2d3d45b77535224b7d0890369bf538c3..ac82080c245e739e270b8f14cfc6f561221d0b7a 100644
--- "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewRKVc.swift"
+++ "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\205\245\345\272\223/NewRKVc.swift"
@@ -128,6 +128,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
@IBAction func gmAction(_ sender: Any) {
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
+ alterView.titleLbl.text = "请填写入库备注"
+ alterView.placerLbl.text = "请填写入库备注..."
self.view.window?.addSubview(alterView)
@@ -282,11 +284,13 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
cell.bzqTf.text = "\(data.BZQ!)"
}
if data.DayType == 1 {
- cell.rightBtn.isSelected = true
- cell.leftBtn.isSelected = false
- }else{
cell.rightBtn.isSelected = false
cell.leftBtn.isSelected = true
+
+ }else{
+ cell.rightBtn.isSelected = true
+ cell.leftBtn.isSelected = false
+
}
return cell
}
diff --git "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\207\272\345\272\223/NewCKVc.swift" "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\207\272\345\272\223/NewCKVc.swift"
index 463f0aff612dac48048834d3666c1799fb578db7..ca1c78bcd2967f1a204d91869629f702c05c7e47 100644
--- "a/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\207\272\345\272\223/NewCKVc.swift"
+++ "b/GeliBusinessPlatform/ViewController/1.1\345\205\245\345\272\223&\345\207\272\345\272\223/\345\207\272\345\272\223/NewCKVc.swift"
@@ -46,7 +46,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
-
+ alterView.titleLbl.text = "请填写出库备注"
+ alterView.placerLbl.text = "请填写出库备注..."
self.view.window?.addSubview(alterView)
}
diff --git "a/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKListVC.swift" "b/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKListVC.swift"
index 60d9c806670dc6413e70553807f1f2888dca858f..3d00aba539ecc0bbb8188f9688cfbfebb527e47a 100644
--- "a/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKListVC.swift"
+++ "b/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKListVC.swift"
@@ -407,12 +407,16 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
if data.io_type == 2 {
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
+ alterView.titleLbl.text = "请填写通过备注"
+ alterView.placerLbl.text = "请填写通过备注..."
self.view.window?.addSubview(alterView)
isPass = true
}
}else{//ä¸é€šè¿‡
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
+ alterView.titleLbl.text = "请填写ä¸é€šè¿‡å¤‡æ³¨"
+ alterView.placerLbl.text = "请填写ä¸é€šè¿‡å¤‡æ³¨..."
self.view.window?.addSubview(alterView)
isPass = false
}
diff --git "a/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKXiangQVC.swift" "b/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKXiangQVC.swift"
index 0c78e7acb6da19a92e087e74cb9eb05b37c7c925..03cebacdd4cce9aea0cae20a5b6173b310b1bca3 100644
--- "a/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKXiangQVC.swift"
+++ "b/GeliBusinessPlatform/ViewController/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/CRKXiangQVC.swift"
@@ -114,12 +114,20 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
let data = self.ioGoodsModels?.first
if self.model?.io_type == 1 {
self.titleArr = ["仓库","库ä½","入库类型","å®¡æ ¸äºº","备注"]
+ var remark = "-"
+ if (model.data?.io_res?.apply_remark)!.count > 0 {
+ remark = (model.data?.io_res?.apply_remark)!
+ }
self.holderArr = [(data?.w_name)! as String,(data?.p_name)! as String
- ,str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String]
+ ,str,(self.model?.auditor)! as String,remark]
self.navbar.title = "商å“入库详情"
}else{
self.titleArr = ["出库类型","å®¡æ ¸äºº","备注"]
- self.holderArr = [str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String]
+ var remark = "-"
+ if (model.data?.io_res?.apply_remark)!.count > 0 {
+ remark = (model.data?.io_res?.apply_remark)!
+ }
+ self.holderArr = [str,(self.model?.auditor)! as String,remark]
self.navbar.title = "商å“出库详情"
}
self.listView.reloadData()
@@ -135,14 +143,31 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
model.data?.goods_res?.forEach({ (item) in
self.ioGoodsModels?.append(item)
})
- let data = self.ioGoodsModels?.first
+
if self.model?.io_type == 1 {
self.titleArr = ["入库类型","å®¡æ ¸äºº","备注","æœªé€šè¿‡åŽŸå› "]
- self.holderArr = [str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String,(model.data?.io_res?.audit_remark)! as String]
+ var remark = "-"
+ if (model.data?.io_res?.apply_remark)!.count > 0 {
+ remark = (model.data?.io_res?.apply_remark)!
+ }
+ var audit_remark = "-"
+ if (model.data?.io_res?.audit_remark)!.count > 0 {
+ audit_remark = (model.data?.io_res?.audit_remark)!
+ }
+
+ self.holderArr = [str,(self.model?.auditor)! as String,remark,audit_remark]
self.navbar.title = "商å“入库详情"
}else{
+ var remark = "-"
+ if (model.data?.io_res?.apply_remark)!.count > 0 {
+ remark = (model.data?.io_res?.apply_remark)!
+ }
+ var audit_remark = "-"
+ if (model.data?.io_res?.audit_remark)!.count > 0 {
+ audit_remark = (model.data?.io_res?.audit_remark)!
+ }
self.titleArr = ["出库类型","å®¡æ ¸äºº","备注","æœªé€šè¿‡åŽŸå› "]
- self.holderArr = [str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String,(model.data?.io_res?.audit_remark)! as String]
+ self.holderArr = [str,(self.model?.auditor)! as String,remark,audit_remark]
self.navbar.title = "商å“出库详情"
}
self.listView.reloadData()
@@ -164,7 +189,11 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
})
if self.isGm == false {
self.titleArr = ["入库类型","备注"]
- self.holderArr = [str,(model.data?.io_res?.apply_remark)! as String]
+ var remark = "-"
+ if (model.data?.io_res?.apply_remark)!.count > 0 {
+ remark = (model.data?.io_res?.apply_remark)!
+ }
+ self.holderArr = [str,remark]
}
self.listView.reloadData()
}) { (error) in
@@ -184,7 +213,11 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
})
if self.isGm == false {
self.titleArr = ["出库类型","备注"]
- self.holderArr = [str,(model.data?.io_res?.apply_remark)! as String]
+ var remark = "-"
+ if (model.data?.io_res?.apply_remark)!.count > 0 {
+ remark = (model.data?.io_res?.apply_remark)!
+ }
+ self.holderArr = [str,remark]
}
self.listView.reloadData()
}) { (error) in
@@ -224,12 +257,16 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
}else{
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
+ alterView.titleLbl.text = "请填写通过备注"
+ alterView.placerLbl.text = "请填写通过备注..."
self.view.window?.addSubview(alterView)
isFailAction = false
}
}else{
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
+ alterView.titleLbl.text = "请填写ä¸é€šè¿‡å¤‡æ³¨"
+ alterView.placerLbl.text = "请填写ä¸é€šè¿‡å¤‡æ³¨..."
self.view.window?.addSubview(alterView)
isFailAction = true
}
diff --git "a/GeliBusinessPlatform/ViewController/\345\225\206\345\223\201\347\256\241\347\220\206/GoodsManageListVC.swift" "b/GeliBusinessPlatform/ViewController/\345\225\206\345\223\201\347\256\241\347\220\206/GoodsManageListVC.swift"
index 615ce68f05ce5797bca3344bae99720097fb5469..b038849ed50d3a4a9b188ba2d6ae0300a1b96035 100644
--- "a/GeliBusinessPlatform/ViewController/\345\225\206\345\223\201\347\256\241\347\220\206/GoodsManageListVC.swift"
+++ "b/GeliBusinessPlatform/ViewController/\345\225\206\345\223\201\347\256\241\347\220\206/GoodsManageListVC.swift"
@@ -498,8 +498,8 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
print("入库哦哦")
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
-// let vc = NewRKVc()
- let vc = NewCKVc()
+ let vc = NewRKVc()
+// let vc = NewCKVc()
vc.sku_id = changeGoodsResModel?.sku_id
vc.goods_id = changeGoodsResModel?.goods_id
self.navigationController?.pushViewController(vc, animated: true)
@@ -531,8 +531,8 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}else{
print("入库哦哦")
-// let vc = NewRKVc()
- let vc = NewCKVc()
+ let vc = NewRKVc()
+// let vc = NewCKVc()
vc.sku_id = changeGoodsResModel?.sku_id
vc.goods_id = changeGoodsResModel?.goods_id
self.navigationController?.pushViewController(vc, animated: true)