|
@@ -96,6 +96,10 @@ class Drafts extends Component {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ componentWillUnmount() {
|
|
|
+ this.imagePickerRef && this.imagePickerRef.clear();
|
|
|
+ }
|
|
|
+
|
|
|
// 部门数据
|
|
|
getDepartmentList() {
|
|
|
getDepartmentList({}).then(v => {
|
|
@@ -283,7 +287,7 @@ class Drafts extends Component {
|
|
|
}
|
|
|
}).catch(() => {
|
|
|
Taro.showToast({
|
|
|
- title: '系统错误,请稍后再试',
|
|
|
+ title: '系统错误,请稍后再试!',
|
|
|
icon: 'none'
|
|
|
})
|
|
|
})
|
|
@@ -383,7 +387,18 @@ class Drafts extends Component {
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ let imgUrls = []
|
|
|
+ if (this.state.imgs.length) {
|
|
|
+ let picArr = [];
|
|
|
+ this.state.imgs.map(function (item) {
|
|
|
+ if (item.url) {
|
|
|
+ picArr.push(item.url.substring(resourceAddress.length));
|
|
|
+ } else {
|
|
|
+ picArr.push(item)
|
|
|
+ }
|
|
|
+ });
|
|
|
+ imgUrls = picArr.join(",");
|
|
|
+ }
|
|
|
this.setState({
|
|
|
loading: true,
|
|
|
});
|
|
@@ -395,7 +410,7 @@ class Drafts extends Component {
|
|
|
typeOther: data.type == 0 ? data.typeOther : undefined, // 其他类型
|
|
|
remarks: data.remarks, // 报销事由
|
|
|
applyDep: (data.type == 4 || data.type == 5) ? undefined : data.applyDep, // 申请部门(借支抵扣不需要)
|
|
|
- attachmentUrl: this.state.imgs.length === 0 ? "" : this.state.imgs.join(","), // 附件
|
|
|
+ attachmentUrl: this.state.imgs.length === 0 ? "" : imgUrls, // 附件
|
|
|
payDep: data.payDep, // 支付部门
|
|
|
orderNo: (data.type == 4 || data.type == 5) ? undefined : data.orderNo, // 订单编号(借支抵扣不需要)
|
|
|
debitId: data.type == 4 ? undefined : data.debitId, // 预支单
|
|
@@ -434,7 +449,6 @@ class Drafts extends Component {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-
|
|
|
getNumHourse(startTime, endTime) {
|
|
|
this.setState({
|
|
|
totalDuration: getNumHourse(
|
|
@@ -808,10 +822,11 @@ class Drafts extends Component {
|
|
|
}}
|
|
|
>删除</View>
|
|
|
{/* <View className="edit">编辑</View> */}
|
|
|
- <View className="formItem">
|
|
|
- <View className="formName">需付款时间:</View>
|
|
|
- <View className="formValue">{item.agreeTimeStr.slice(0, 10)}</View>
|
|
|
- </View>
|
|
|
+ {!!item.agreeTimeStr &&
|
|
|
+ <View className="formItem">
|
|
|
+ <View className="formName">需付款时间:</View>
|
|
|
+ <View className="formValue">{item.agreeTimeStr.slice(0, 10)}</View>
|
|
|
+ </View>}
|
|
|
<View className="formItem">
|
|
|
<View className="formName">付款方式:</View>
|
|
|
<View className="formValue">{["公对公转账"][item.payType]}</View>
|
|
@@ -845,14 +860,16 @@ class Drafts extends Component {
|
|
|
<View className="formValue">{item.amount}</View>
|
|
|
</View>
|
|
|
</View>
|
|
|
- )}
|
|
|
- {data.type != 4 &&
|
|
|
+ )
|
|
|
+ }
|
|
|
+ {
|
|
|
+ data.type != 4 &&
|
|
|
<View className="formItem">
|
|
|
<View className="formName">{data.type == 5 ? "抵扣借支:" : "抵扣:"}</View>
|
|
|
<View className="formValue"
|
|
|
onClick={() => {
|
|
|
Taro.navigateTo({
|
|
|
- url: `/pages/debitnote/index?depId=${data.applyDep}`
|
|
|
+ url: `/pages/debitnote/index?depId=${data.applyDep}&id=${data.id}`
|
|
|
})
|
|
|
}}
|
|
|
>
|
|
@@ -862,18 +879,23 @@ class Drafts extends Component {
|
|
|
<AtIcon value="chevron-right" size="20" color="#000000" />
|
|
|
</View>}
|
|
|
</View>
|
|
|
- </View>}
|
|
|
+ </View>
|
|
|
+ }
|
|
|
{data.type != 4 && data.type != 5 && < View className="tips">注:如需抵扣借支,请选择对应的借支订单</View>}
|
|
|
- {data.type != 4 && data.type != 5 &&
|
|
|
+ {
|
|
|
+ data.type != 4 && data.type != 5 &&
|
|
|
<View className="formItem" style={{ paddingTop: "10px" }}>
|
|
|
<View className="formName">总金额:</View>
|
|
|
<View className="formValue"><Text style={{ color: "red" }}>{total}</Text>(元)</View>
|
|
|
- </View>}
|
|
|
- {data.type != 4 && data.type != 5 &&
|
|
|
+ </View>
|
|
|
+ }
|
|
|
+ {
|
|
|
+ data.type != 4 && data.type != 5 &&
|
|
|
<View className="formItem" style={{ paddingTop: "10px" }}>
|
|
|
<View className="formName">实报金额:</View>
|
|
|
<View className="formValue"><Text style={{ color: "red" }}>{this.state.reality}</Text>(元)</View>
|
|
|
- </View>}
|
|
|
+ </View>
|
|
|
+ }
|
|
|
<View className="formItem" style={{ display: "block", paddingBottom: 0 }}>
|
|
|
<View className="formName">附件:</View>
|
|
|
<View
|