|
@@ -313,7 +313,7 @@ class EgressDetails extends Component {
|
|
|
) : (
|
|
|
<View>
|
|
|
<View className="title">
|
|
|
- {dtails.aname}提交的公出申请
|
|
|
+ {dtails.type === 3 ? dtails.mainName : dtails.aname}提交的公出申请
|
|
|
{dtails.updateStatus == 1 && (
|
|
|
<View className="titRight">改</View>
|
|
|
)}
|
|
@@ -330,14 +330,10 @@ class EgressDetails extends Component {
|
|
|
<Image
|
|
|
src={
|
|
|
dtails.status === 0
|
|
|
- ? Rejected
|
|
|
- : dtails.status === 1
|
|
|
- ? Reviewed
|
|
|
- : dtails.status === 2
|
|
|
- ? Passed
|
|
|
- : dtails.status === 3
|
|
|
- ? Revoke
|
|
|
- : ""
|
|
|
+ ? Rejected : dtails.status === 1
|
|
|
+ ? Reviewed : dtails.status === 2
|
|
|
+ ? Passed : dtails.status === 3
|
|
|
+ ? Revoke : ""
|
|
|
}
|
|
|
className="startIcon"
|
|
|
/>
|
|
@@ -353,7 +349,7 @@ class EgressDetails extends Component {
|
|
|
<View className="item">
|
|
|
<View className="title">
|
|
|
公出地点:
|
|
|
- {dtails.permission === 0 &&
|
|
|
+ {dtails.permission === 0 && dtails.type !== 3 &&
|
|
|
(dtails.status === 0 || dtails.status === 3) ? (
|
|
|
<View
|
|
|
className="edit"
|
|
@@ -432,10 +428,10 @@ class EgressDetails extends Component {
|
|
|
<View className="title">公出类型</View>
|
|
|
<View className="value">
|
|
|
{dtails.type == 0
|
|
|
- ? "业务公出"
|
|
|
- : dtails.type == 1
|
|
|
- ? "技术公出"
|
|
|
- : dtails.type == 2 && "行政公出"}
|
|
|
+ ? "业务公出" : dtails.type == 1
|
|
|
+ ? "技术公出" : dtails.type == 2
|
|
|
+ ? "行政公出" : dtails.type == 3
|
|
|
+ ? "技术协单" : ""}
|
|
|
</View>
|
|
|
</View>
|
|
|
{dtails.type == 1 ? (
|
|
@@ -454,7 +450,7 @@ class EgressDetails extends Component {
|
|
|
dtails.assistAidName != null && dtails.assistAidName != "" &&
|
|
|
<View className="item">
|
|
|
<View className="title" style={{ color: "red" }}>技术协单</View>
|
|
|
- <View className="value">{dtails.assistAidName.replace(",", " ")}</View>
|
|
|
+ <View className="value">{dtails.assistAidName.replace(/,/g, " ")}</View>
|
|
|
</View>
|
|
|
}
|
|
|
{/* 公出目标 */}
|
|
@@ -551,7 +547,7 @@ class EgressDetails extends Component {
|
|
|
</AtButton>
|
|
|
</View>
|
|
|
) : null}
|
|
|
- {dtails.permission === 0 && dtails.status !== 3 ? (
|
|
|
+ {dtails.permission === 0 && dtails.status !== 3 && dtails.type !== 3 ? (
|
|
|
<View className="item">
|
|
|
<View className="title">修改/撤销</View>
|
|
|
<AtTextarea
|
|
@@ -566,7 +562,7 @@ class EgressDetails extends Component {
|
|
|
/>
|
|
|
</View>
|
|
|
) : null}
|
|
|
- {dtails.permission === 0 && dtails.status !== 3 ? (
|
|
|
+ {dtails.permission === 0 && dtails.status !== 3 && dtails.type !== 3 ? (
|
|
|
<View className="operation">
|
|
|
<Button
|
|
|
type="warn"
|