|
|
@@ -48,6 +48,8 @@ import MessageNoticebar from "../../components/common/messageNoticebar";
|
|
|
import { getClockState, unique, getUids } from "../../utils/tools";
|
|
|
import HistoricalClock from "../../components/historicalClock";
|
|
|
import UserQuery from "../../components/common/userquery"; //选择协单人弹窗
|
|
|
+import { Fragment } from "react";
|
|
|
+import { assistTypeList, assistContentList } from "../../utils/tools/config"
|
|
|
|
|
|
class EgressDetails extends Component {
|
|
|
$instance = getCurrentInstance();
|
|
|
@@ -82,7 +84,10 @@ class EgressDetails extends Component {
|
|
|
// status=1 0驳回 1发起 2通过
|
|
|
// type 0业务 1技术 2行政 3协单 4协单助手
|
|
|
|
|
|
- detailUrl: ''
|
|
|
+ detailUrl: '',
|
|
|
+
|
|
|
+ assistTypeName: '',
|
|
|
+ assistContentTypeName: '',
|
|
|
};
|
|
|
this.examinePublicRelease = this.examinePublicRelease.bind(this);
|
|
|
this.getReleasetDails = this.getReleasetDails.bind(this);
|
|
|
@@ -154,6 +159,21 @@ class EgressDetails extends Component {
|
|
|
}
|
|
|
}
|
|
|
v.data.annexUrl = list;
|
|
|
+
|
|
|
+ let assistTypeName = ''
|
|
|
+ let assistContentTypeName = ''
|
|
|
+ if (v.data.type == 5) {
|
|
|
+
|
|
|
+ const assistType = v.data.assistType || ''
|
|
|
+ const assistContentType = v.data.assistContentType || ''
|
|
|
+
|
|
|
+ let currAssistTypeOption = assistTypeList.filter(item => assistType.indexOf(item.id) > -1)
|
|
|
+ assistTypeName = currAssistTypeOption.map(item => item.title).join(',')
|
|
|
+
|
|
|
+ let currAssistContentTypeOption = assistContentList.filter(item => assistContentType.indexOf(item.id) > -1)
|
|
|
+ assistContentTypeName = currAssistContentTypeOption.map(item => item.title).join(',')
|
|
|
+ }
|
|
|
+
|
|
|
this.setState({
|
|
|
dtails: v.data,
|
|
|
coorderList: v.data.assistantName != null && v.data.assistantName != "" ? v.data.assistantName.split(",") : [],
|
|
|
@@ -163,6 +183,8 @@ class EgressDetails extends Component {
|
|
|
latitude: parseFloat(v.data.prdList[0]?.latitude),
|
|
|
name: v.data.prdList[0]?.districtName,
|
|
|
},
|
|
|
+ assistTypeName,
|
|
|
+ assistContentTypeName,
|
|
|
});
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
@@ -611,7 +633,8 @@ class EgressDetails extends Component {
|
|
|
</View>
|
|
|
<View className="timeContent">
|
|
|
<View className="time">
|
|
|
- <View className="num">公出{dtails.duration}小时</View>
|
|
|
+
|
|
|
+ <View className="num">公出{[5, 6].indexOf(dtails.type) > -1 ? 0 : dtails.duration}小时</View>
|
|
|
<View
|
|
|
className="journal"
|
|
|
onClick={(e) => {
|
|
|
@@ -675,7 +698,8 @@ class EgressDetails extends Component {
|
|
|
? "行政公出" : dtails.type == 3
|
|
|
? "技术协单" : dtails.type == 4
|
|
|
? "协单助手" : dtails.type == 5
|
|
|
- ? "非公出协单" : ""}
|
|
|
+ ? "非公出协单" : dtails.type == 6
|
|
|
+ ? "非公出协单" : ""}
|
|
|
</View>
|
|
|
</View>
|
|
|
{dtails.type == 1 ? (
|
|
|
@@ -721,20 +745,40 @@ class EgressDetails extends Component {
|
|
|
<View className="title">本人公出</View>
|
|
|
<View className="value">{["", "是,一同公出", "否,本人不公出"][dtails.alone]}</View>
|
|
|
</View>}
|
|
|
+
|
|
|
+ { [5, 6].indexOf(dtails.type) > -1 ? (
|
|
|
+ <Fragment>
|
|
|
+ <View className="item">
|
|
|
+ <View className="title">协单类型</View>
|
|
|
+ <View className="value">{this.state.assistTypeName}</View>
|
|
|
+ </View>
|
|
|
+ <View className="item">
|
|
|
+ <View className="title">协单内容</View>
|
|
|
+ <View className="value">{this.state.assistContentTypeName}</View>
|
|
|
+ </View>
|
|
|
+ { dtails.assistContentType.indexOf('0') > -1 && (
|
|
|
+ <View className="item">
|
|
|
+ <View className="title">内容说明</View>
|
|
|
+ <View className="value">{dtails.assistContent}</View>
|
|
|
+ </View>
|
|
|
+ ) }
|
|
|
+ </Fragment>
|
|
|
+ ) : null }
|
|
|
+
|
|
|
{/* 公出目标 */}
|
|
|
- {[1, 2].indexOf(dtails.type) > -1 && (<View className="item">
|
|
|
+ {[1, 2, 5].indexOf(dtails.type) > -1 && (<View className="item">
|
|
|
<View className="title">公出目标</View>
|
|
|
<View className="value">{dtails.remarks}</View>
|
|
|
</View>)}
|
|
|
{/* 公出计划 */}
|
|
|
- {dtails.type === 1 && (
|
|
|
+ {[1, 5].indexOf(dtails.type) > -1 && (
|
|
|
<View className="item">
|
|
|
<View className="title">公出计划</View>
|
|
|
<View className="value">{dtails.plan}</View>
|
|
|
</View>
|
|
|
)}
|
|
|
{/* 预计效果 */}
|
|
|
- {dtails.type === 1 && (
|
|
|
+ {[1, 5].indexOf(dtails.type) > -1 && (
|
|
|
<View className="item">
|
|
|
<View className="title">预计效果</View>
|
|
|
<View className="value">{dtails.expectedEffect}</View>
|