|
@@ -1,6 +1,6 @@
|
|
|
import React, { Component } from "react";
|
|
|
import Taro, { getCurrentInstance } from "@tarojs/taro";
|
|
|
-import { Button, Picker, Text, View } from "@tarojs/components";
|
|
|
+import { Button, Picker, Text, View, Image } from "@tarojs/components";
|
|
|
import dayjs from "dayjs";
|
|
|
import ImagePicker from "../../components/common/imagePicker";
|
|
|
import InquiryModal from "../../components/common/inquiryModal";
|
|
@@ -42,6 +42,7 @@ import "taro-ui/dist/style/components/icon.scss";
|
|
|
import "taro-ui/dist/style/components/textarea.scss";
|
|
|
import "taro-ui/dist/style/components/input.scss";
|
|
|
|
|
|
+import Right from '../../image/right.png';
|
|
|
import "./index.less";
|
|
|
import NewModal from "./modal"
|
|
|
|
|
@@ -511,7 +512,7 @@ class Drafts extends Component {
|
|
|
<View className="inputFormItem">
|
|
|
<AtInput
|
|
|
name='userNames'
|
|
|
- title='公出企业:'
|
|
|
+ title='公出企业:'
|
|
|
type='text'
|
|
|
placeholder='请填写公出企业'
|
|
|
value={data.userNames}
|
|
@@ -522,7 +523,7 @@ class Drafts extends Component {
|
|
|
<View className="inputFormItem">
|
|
|
<AtInput
|
|
|
name='districtName'
|
|
|
- title='公出地点:'
|
|
|
+ title='公出地点:'
|
|
|
type='text'
|
|
|
placeholder='请填写公出地点'
|
|
|
value={data.districtName}
|
|
@@ -531,7 +532,7 @@ class Drafts extends Component {
|
|
|
</View>}
|
|
|
{data.type == 1 &&
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">公出时间:</View>
|
|
|
+ <View className="formName">公出时间:</View>
|
|
|
<View className="formValue">
|
|
|
<View
|
|
|
className="time"
|
|
@@ -544,12 +545,12 @@ class Drafts extends Component {
|
|
|
{this.state.rangeStartMinuteVal &&
|
|
|
this.state.rangeEndMinuteVal ? (
|
|
|
<View className="timeContent">
|
|
|
- <View style={{ textAlign: "center" }}>{this.state.rangeStartMinuteVal}</View>
|
|
|
- 至
|
|
|
- <View style={{ textAlign: "center" }}>{this.state.rangeEndMinuteVal}</View>
|
|
|
+ <View>{this.state.rangeStartMinuteVal.slice(0, 16)} 至 {this.state.rangeEndMinuteVal.slice(0, 16)}</View>
|
|
|
+ {/* <View>至</View>
|
|
|
+ <View>{this.state.rangeEndMinuteVal}</View> */}
|
|
|
</View>
|
|
|
) : (
|
|
|
- "请选择时间"
|
|
|
+ <View className="seltime">请选择时间</View>
|
|
|
)}
|
|
|
</View>
|
|
|
<timePicker
|
|
@@ -584,11 +585,11 @@ class Drafts extends Component {
|
|
|
</View>}
|
|
|
{data.type == 1 &&
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">公出时长:</View>
|
|
|
+ <View className="formName">公出时长:</View>
|
|
|
<View className="formValue">{this.state.totalDuration}小时</View>
|
|
|
</View>}
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">申请类型:</View>
|
|
|
+ <View className="formName">申请类型:</View>
|
|
|
<View className="formValue" onClick={() => {
|
|
|
this.setState({
|
|
|
isInquiryOpened: true,
|
|
@@ -607,7 +608,7 @@ class Drafts extends Component {
|
|
|
</View>
|
|
|
{data.type != 4 && data.type != 5 &&
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">报销至订单:</View>
|
|
|
+ <View className="formName">报销至订单:</View>
|
|
|
<View className="formValue" onClick={() => {
|
|
|
Taro.navigateTo({
|
|
|
url: "/pages/dataindex/index"
|
|
@@ -624,13 +625,13 @@ class Drafts extends Component {
|
|
|
{(data.type == 4 || data.type == 5) ? "申请详细" : "报销详细"}
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">申请人:</View>
|
|
|
+ <View className="formName">申请人:</View>
|
|
|
<View className="formValue">{data.aname}</View>
|
|
|
</View>
|
|
|
{
|
|
|
data.type != 4 && data.type != 5 &&
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">报销公司:</View>
|
|
|
+ <View className="formName">报销公司:</View>
|
|
|
<View className="formValue">
|
|
|
<Picker
|
|
|
value={departmentArr.findIndex(item => item.id === data.applyDep)}
|
|
@@ -652,8 +653,8 @@ class Drafts extends Component {
|
|
|
<View className="formItem">
|
|
|
<View className="formName">
|
|
|
{data.type == 4
|
|
|
- ? "预借支公司:" : data.type == 5
|
|
|
- ? "抵扣公司:" : "支付公司:"}</View>
|
|
|
+ ? "预借支公司:" : data.type == 5
|
|
|
+ ? "抵扣公司:" : "支付公司:"}</View>
|
|
|
<View className="formValue">
|
|
|
<Picker
|
|
|
value={departmentArr.findIndex(item => item.id === data.payDep)}
|
|
@@ -672,7 +673,7 @@ class Drafts extends Component {
|
|
|
</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">{(data.type == 4 || data.type == 5) ? "说明:" : "报销事由:"}</View>
|
|
|
+ <View className="formName">{(data.type == 4 || data.type == 5) ? "说明:" : "报销事由:"}</View>
|
|
|
<View className="formValues">
|
|
|
<AtTextarea
|
|
|
value={data.remarks == null ? "" : data.remarks}
|
|
@@ -684,7 +685,7 @@ class Drafts extends Component {
|
|
|
}}
|
|
|
height={75}
|
|
|
maxLength={50}
|
|
|
- placeholder={(data.type == 4 || data.type == 5) ? "请填写说明:" : "请填写报销事由"}
|
|
|
+ placeholder={(data.type == 4 || data.type == 5) ? "请填写说明:" : "请填写报销事由"}
|
|
|
/>
|
|
|
</View>
|
|
|
</View>
|
|
@@ -724,40 +725,41 @@ class Drafts extends Component {
|
|
|
>删除</View>
|
|
|
{/* <View className="edit">编辑</View> */}
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">交通工具:</View>
|
|
|
+ <View className="formName">交通工具:</View>
|
|
|
<View className="formValue">{getVehicleName(item.vehicle, item.vehicleOther)}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">时间:</View>
|
|
|
+ <View className="formName">地点:</View>
|
|
|
<View className="formValue">
|
|
|
- <View className="ftxt">{item.startTimeStr.slice(0, 16)}</View>
|
|
|
- 至
|
|
|
- <View className="ftxt">{item.endTimeStr.slice(0, 16)}</View>
|
|
|
+ <View className="ftxt">{item.startDistrict}</View>
|
|
|
+ <Image src={Right} className='ricon' mode='aspectFit' />
|
|
|
+ {/* <Text style={{ fontSize: "30px", padding: "0 5px" }}>⇀</Text> */}
|
|
|
+ <View className="ftxt">{item.endDistrict}</View>
|
|
|
</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">地点:</View>
|
|
|
- <View className="formValue">
|
|
|
- <View className="ftxt">{item.startDistrict}</View>
|
|
|
- <Text style={{ fontSize: "30px", padding: "0 5px" }}>⇀</Text>
|
|
|
- <View className="ftxt">{item.endDistrict}</View>
|
|
|
+ <View className="formName">时间:</View>
|
|
|
+ <View className="formValuetime">
|
|
|
+ <View className="ftxt">{item.startTimeStr.slice(0, 16)}</View>
|
|
|
+ 至
|
|
|
+ <View className="ftxt">{item.endTimeStr.slice(0, 16)}</View>
|
|
|
</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">金额:</View>
|
|
|
+ <View className="formName">金额:</View>
|
|
|
<View className="formValue">{item.amount}(元)</View>
|
|
|
</View>
|
|
|
</View>
|
|
|
: <View className="inputFormItems" key={item.id}>
|
|
|
{/* <AtInput
|
|
|
name={item.id}
|
|
|
- title={getTypeName(item.type) + ":"}
|
|
|
+ title={getTypeName(item.type) + ":"}
|
|
|
type='number'
|
|
|
placeholder='请输入金额(元)'
|
|
|
value={item.amount}
|
|
|
/> */}
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">{getTypeName(item.type) + ":"}</View>
|
|
|
+ <View className="formName">{getTypeName(item.type) + ":"}</View>
|
|
|
<View className="formValue">{item.amount}(元)</View>
|
|
|
</View>
|
|
|
<View className="close"
|
|
@@ -792,14 +794,14 @@ class Drafts extends Component {
|
|
|
{/* <View className="edit">编辑</View> */}
|
|
|
{!!item.agreeTimeStr &&
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">{data.type == 5 ? "支付时间:" : "需付款时间:"}</View>
|
|
|
+ <View className="formName">{data.type == 5 ? "支付时间:" : "需付款时间:"}</View>
|
|
|
<View className="formValue">{item.agreeTimeStr.slice(0, 10)}</View>
|
|
|
</View>}
|
|
|
<View className="formItem">
|
|
|
<View className="formName">
|
|
|
{data.type == 4
|
|
|
- ? "预借支金额:" : data.type == 5
|
|
|
- ? "抵扣金额:" : "金额:"}
|
|
|
+ ? "预借支金额:" : data.type == 5
|
|
|
+ ? "抵扣金额:" : "金额:"}
|
|
|
</View>
|
|
|
<View className="formValue">{item.amount}(元)</View>
|
|
|
</View>
|
|
@@ -824,39 +826,39 @@ class Drafts extends Component {
|
|
|
{/* <View className="edit">编辑</View> */}
|
|
|
{!!item.agreeTimeStr &&
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">需付款时间:</View>
|
|
|
+ <View className="formName">需付款时间:</View>
|
|
|
<View className="formValue">{item.agreeTimeStr.slice(0, 10)}</View>
|
|
|
</View>}
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">付款方式:</View>
|
|
|
+ <View className="formName">付款方式:</View>
|
|
|
<View className="formValue">{["公对公转账"][item.payType]}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">发票类型:</View>
|
|
|
+ <View className="formName">发票类型:</View>
|
|
|
<View className="formValue">{["普票", "专票"][item.invoiceType]}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">发票号:</View>
|
|
|
+ <View className="formName">发票号:</View>
|
|
|
<View className="formValue">{item.invoiceNo}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">付款单位:</View>
|
|
|
+ <View className="formName">付款单位:</View>
|
|
|
<View className="formValue">{item.payerName}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">开户银行:</View>
|
|
|
+ <View className="formName">开户银行:</View>
|
|
|
<View className="formValue">{item.openBank}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">银行账户:</View>
|
|
|
+ <View className="formName">银行账户:</View>
|
|
|
<View className="formValue">{item.bankAccounts}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">开户行地址:</View>
|
|
|
+ <View className="formName">开户行地址:</View>
|
|
|
<View className="formValue">{item.openBankAddress}</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">金额(元):</View>
|
|
|
+ <View className="formName">金额(元):</View>
|
|
|
<View className="formValue">{item.amount}</View>
|
|
|
</View>
|
|
|
</View>
|
|
@@ -865,7 +867,7 @@ class Drafts extends Component {
|
|
|
{
|
|
|
data.type != 4 &&
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">{data.type == 5 ? "抵扣借支:" : "抵扣:"}</View>
|
|
|
+ <View className="formName">{data.type == 5 ? "抵扣借支:" : "抵扣:"}</View>
|
|
|
<View className="formValue"
|
|
|
onClick={() => {
|
|
|
Taro.navigateTo({
|
|
@@ -885,19 +887,19 @@ class Drafts extends Component {
|
|
|
{
|
|
|
data.type != 4 && data.type != 5 &&
|
|
|
<View className="formItem" style={{ paddingTop: "10px" }}>
|
|
|
- <View className="formName">总金额:</View>
|
|
|
+ <View className="formName">总金额:</View>
|
|
|
<View className="formValue"><Text style={{ color: "red" }}>{total}</Text>(元)</View>
|
|
|
</View>
|
|
|
}
|
|
|
{
|
|
|
data.type != 4 && data.type != 5 &&
|
|
|
<View className="formItem" style={{ paddingTop: "10px" }}>
|
|
|
- <View className="formName">实报金额:</View>
|
|
|
+ <View className="formName">实报金额:</View>
|
|
|
<View className="formValue"><Text style={{ color: "red" }}>{this.state.reality}</Text>(元)</View>
|
|
|
</View>
|
|
|
}
|
|
|
<View className="formItem" style={{ display: "block", paddingBottom: 0 }}>
|
|
|
- <View className="formName">附件:</View>
|
|
|
+ <View className="formName">附件:</View>
|
|
|
<View
|
|
|
className="formValue"
|
|
|
style={{ paddingTop: "10px", textAlign: "left" }}
|