|
@@ -56,9 +56,9 @@ let mShowBillModels, mFormBillModels, mUpdateBillModels, mAllBillModels
|
|
|
|
|
|
let mBaseUrl = window.location.origin
|
|
|
+ (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
|
|
|
- // && 'http://yrkj.usoftchina.com:9443/uas'
|
|
|
+// && 'http://yrkj.usoftchina.com:9443/uas'
|
|
|
// && 'http://erp.yitoa.com:8888/ERP'
|
|
|
-// && 'http://29226oq576.qicp.vip/erp'
|
|
|
+// && 'http://sisemi03.zicp.io/ERP'
|
|
|
|
|
|
export default class ApprovalAdd extends Component {
|
|
|
|
|
@@ -827,20 +827,26 @@ export default class ApprovalAdd extends Component {
|
|
|
promptAble: false,
|
|
|
})
|
|
|
let nodeid = response.nodeId
|
|
|
- if (mId <= 0) {
|
|
|
- mId = response[mKeyField] || response.keyvalue
|
|
|
- let formcode = response.formcode
|
|
|
- let isSave = response.isSave
|
|
|
- if (isSave == true || isSave == 'true') {
|
|
|
- this.toApprovalDetail(nodeid)
|
|
|
- } else {
|
|
|
- this.judgeApproval(nodeid, mId, formcode)
|
|
|
- }
|
|
|
+ if (nodeid == -1) {
|
|
|
message.success('单据提交成功')
|
|
|
+ this.props.history.goBack()
|
|
|
} else {
|
|
|
- this.judgeApproval(nodeid, mId, '')
|
|
|
- message.success('单据提交成功')
|
|
|
+ if (mId <= 0) {
|
|
|
+ mId = response[mKeyField] || response.keyvalue
|
|
|
+ let formcode = response.formcode
|
|
|
+ let isSave = response.isSave
|
|
|
+ if (isSave == true || isSave == 'true') {
|
|
|
+ this.toApprovalDetail(nodeid)
|
|
|
+ } else {
|
|
|
+ this.judgeApproval(nodeid, mId, formcode)
|
|
|
+ }
|
|
|
+ message.success('单据提交成功')
|
|
|
+ } else {
|
|
|
+ this.judgeApproval(nodeid, mId, '')
|
|
|
+ message.success('单据提交成功')
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
} else {
|
|
|
message.error('单据提交失败')
|
|
|
}
|