|
|
@@ -128,6 +128,8 @@ class PublicContent extends Component {
|
|
|
let assistTypeName = ''
|
|
|
let assistContentTypeName = ''
|
|
|
if ([5, 6].indexOf(this.props.dtails.type) > -1 || this.props.dtails.type == 0 && list.length) {
|
|
|
+ rangeStartMinuteVal = dayjs(this.props.dtails.releaseStarts).format("YYYY-MM-DD")
|
|
|
+ rangeEndMinuteVal = dayjs(this.props.dtails.releaseEnds).format("YYYY-MM-DD")
|
|
|
const assistType = this.props.dtails.assistType || ''
|
|
|
const assistContentType = this.props.dtails.assistContentType || ''
|
|
|
|
|
|
@@ -1061,7 +1063,7 @@ class PublicContent extends Component {
|
|
|
{ [5, 6].indexOf(dtails.type) > -1 || (dtails.type == 0 && this.state.cList.length) ? (
|
|
|
<Fragment>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">协单类型:</View>
|
|
|
+ <View className="formName"><Text style={{ color: "red" }}>*</Text>协单类型:</View>
|
|
|
<View className="formValue" onClick={() => this.handleOpenMultiplePicker('assistType')}>
|
|
|
<Text className="formValueText">
|
|
|
{ this.state.assistTypeName }
|
|
|
@@ -1070,7 +1072,7 @@ class PublicContent extends Component {
|
|
|
</View>
|
|
|
</View>
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">协单内容:</View>
|
|
|
+ <View className="formName"><Text style={{ color: "red" }}>*</Text>协单内容:</View>
|
|
|
<View className="formValue" onClick={() => this.handleOpenMultiplePicker('assistContentType')}>
|
|
|
<Text className="formValueText">
|
|
|
{ this.state.assistContentTypeName }
|
|
|
@@ -1080,7 +1082,7 @@ class PublicContent extends Component {
|
|
|
</View>
|
|
|
{ (this.state.assistContentType || '').indexOf('0') > -1 ? (
|
|
|
<View className="formItem">
|
|
|
- <View className="formName">内容说明:</View>
|
|
|
+ <View className="formName"><Text style={{ color: "red" }}>*</Text>内容说明:</View>
|
|
|
<View
|
|
|
className="formValue"
|
|
|
style={{ paddingTop: "10px", textAlign: "left" }}
|
|
|
@@ -1290,14 +1292,19 @@ class PublicContent extends Component {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (([5, 6].indexOf(this.props.dtails.type) > -1 || (this.props.dtails.type == 0 && this.state.cList.length)) && !this.state.assistType) {
|
|
|
- Taro.showToast({ title: "请选择协单类型", icon: "none" });
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- if (([5, 6].indexOf(this.props.dtails.type) > -1 || (this.props.dtails.type == 0 && this.state.cList.length)) && !this.state.assistContentType) {
|
|
|
- Taro.showToast({ title: "请选择协单内容", icon: "none" });
|
|
|
- return;
|
|
|
+ if ([5, 6].indexOf(this.props.dtails.type) > -1 || (this.props.dtails.type == 0 && this.state.cList.length)) {
|
|
|
+ if (!this.state.assistType) {
|
|
|
+ Taro.showToast({ title: "请选择协单类型", icon: "none" });
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (!this.state.assistContentType) {
|
|
|
+ Taro.showToast({ title: "请选择协单内容", icon: "none" });
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.state.assistType.indexOf('0') && !this.state.assistContent) {
|
|
|
+ Taro.showToast({ title: "请输入协单内容说明", icon: "none" });
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (!this.state.reason && this.props.dtails.type != 0) {
|