lilei 4 lat temu
rodzic
commit
ba62720ac7

+ 1 - 1
pages/spotCheckConfigure/addSpotCheck.vue

@@ -228,7 +228,7 @@ export default {
 			let d = val.year + '-' + val.month + '-' + val.day;
 			let a = this.form.startDate;
 			if (a == '' || moment(d).isAfter(a)) {
-				if(a=='' && moment(d).isSameOrAfter(moment(),'day')){
+				if(moment(d).isSameOrAfter(moment(),'day')){
 					this.form.endDate = d;
 				}else{
 					uni.showToast({

+ 8 - 5
pages/spotCheckConfigure/evaluateItem.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="kp-details">
 		<!-- 考评项 -->
-		<view class="kp-tabsBox">
+		<view class="kp-tabsBox" v-if="items.length>0">
 			<view class="kp-tabs">
 				<view @click="onTab(index)" :class="activeIndex == index ? 'active':''" v-for="(item,index) in items" :key="item.id">
 					<view>{{item.name}}</view>
-					<view>({{item.assessTargetNum}}项)</view>
+					<view>({{item.assessTargetNum||0}}项)</view>
 				</view>
 			</view>
 			<view class="kp-items">
@@ -15,10 +15,12 @@
 						<checkbox :value="item.id" :checked="item.checked" />
 					</view>
 				</view>
-				<u-empty style="height: auto;padding-top: 10vh;" text="暂无指标" img-width="120" v-if="!childItems.length&&items.length" mode="list"></u-empty>
+				<view v-if="childItems.length==0">
+					<u-empty style="height: auto;padding-top: 10vh;" text="暂无指标" img-width="120" mode="list"></u-empty>
+				</view>
 			</view>
 		</view>
-		<view style="flex-grow: 1;height: 100%;" v-if="items.length==0">
+		<view style="flex-grow: 1;height: 100%;" v-else>
 			<u-empty style="height: auto;padding-top: 10vh;" text="暂无考评项" mode="list"></u-empty>
 		</view>
 		<!-- 选择按钮 -->
@@ -45,6 +47,7 @@
 				item.id = item.assessTargetId
 			})
 			findAllItem().then(res=>{
+				console.log(res)
 				if(res.status == 200){
 					this.items = res.data
 					this.onTab(0)
@@ -54,7 +57,7 @@
 		methods:{
 			onTab(index){
 				this.activeIndex = index
-				this.childItems = this.items[index].assessTargetList
+				this.childItems = this.items[index].assessTargetList || []
 				this.childItems.map(item=>{
 					let hasItemIndex = this.checkedList.findIndex(o=>o.id==item.id)
 					item.checked = hasItemIndex>=0