From 7133cf7a9055fa88df7abb1be67d5ae55b89e004 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 27 Sep 2021 10:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=B7=A5=E4=BD=9C=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/checkjob/detail.wxml  | 13 +++++++++++--
 pages/checkjob/job.wxml     |  6 +++---
 pages/checkjob/yanshou.wxml | 14 +++++++++++---
 wxs/subutil.wxs             |  9 ++++++++-
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/pages/checkjob/detail.wxml b/pages/checkjob/detail.wxml
index fab5c97..bad8bc6 100644
--- a/pages/checkjob/detail.wxml
+++ b/pages/checkjob/detail.wxml
@@ -1,3 +1,4 @@
+<wxs src="../../wxs/subutil.wxs" module="tools" />
 <view class="topban">任务详情</view>
 <view class="weui-cells weui-cells_after-title">
   <view class="weui-cell weui-cell_access">
@@ -26,10 +27,10 @@
   </view>
    <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
-      <view>检查时间</view>
+      <view>任务时间段</view>
     </view>
     <view class="weui-cell__ft">
-      {{checktask__checktime}}
+      {{tools.subDate(starttime)}}到{{tools.subDate(endtime)}}
     </view>
   </view>
    <view class="weui-cell weui-cell_access">
@@ -39,6 +40,14 @@
     <view class="weui-cell__ft" style="width:200px">
       {{checktask__checktype__checkcontent}}
     </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>检查时间段</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{tools.subDate(jctime)}}到{{tools.subDate(jctime2)}}
+    </view>
   </view>
    <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
diff --git a/pages/checkjob/job.wxml b/pages/checkjob/job.wxml
index b66a58b..01bf0aa 100644
--- a/pages/checkjob/job.wxml
+++ b/pages/checkjob/job.wxml
@@ -1,5 +1,5 @@
 <!--pages/checkjob/job.wxml-->
-
+<wxs src="../../wxs/subutil.wxs" module="tools" />
 <view class="page">
 	<view class="page__bd">
 
@@ -30,10 +30,10 @@
 			</view>
 			<view class="weui-cell weui-cell_access">
 				<view class="weui-cell__bd weui-cell_primary">
-					<view>检查时间</view>
+					<view>任务时间段</view>
 				</view>
 				<view class="weui-cell__ft">
-					{{checktask__checktime}}
+					{{tools.subDate(starttime)}}到{{tools.subDate(endtime)}}
 				</view>
 			</view>
 			<view class="weui-cell weui-cell_access">
diff --git a/pages/checkjob/yanshou.wxml b/pages/checkjob/yanshou.wxml
index f42219f..a9ff7a3 100644
--- a/pages/checkjob/yanshou.wxml
+++ b/pages/checkjob/yanshou.wxml
@@ -1,5 +1,5 @@
 <!--pages/checkjob/job.wxml-->
-
+<wxs src="../../wxs/subutil.wxs" module="tools" />
 <view class="page">
   <view class="page__bd">
 
@@ -30,10 +30,10 @@
   </view>
    <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
-      <view>检查时间</view>
+      <view>任务时间段</view>
     </view>
     <view class="weui-cell__ft">
-      {{checktask__checktime}}
+      {{tools.subDate(starttime)}}到{{tools.subDate(endtime)}}
     </view>
   </view>
    <view class="weui-cell weui-cell_access">
@@ -43,6 +43,14 @@
     <view class="weui-cell__ft" style="width:200px">
       {{checktask__checktype__checkcontent}}
     </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>检查时间段</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{tools.subDate(jctime)}}到{{tools.subDate(jctime2)}}
+    </view>
   </view>
    <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
diff --git a/wxs/subutil.wxs b/wxs/subutil.wxs
index e4222bc..e3f1313 100644
--- a/wxs/subutil.wxs
+++ b/wxs/subutil.wxs
@@ -8,4 +8,11 @@ var sub = function(val) {
     return val;
   }
 }
-module.exports.sub = sub;
\ No newline at end of file
+var subDate = function(val) {
+  if (val == undefined||val.length==0) {
+    return;
+  }
+    return val.substring(0, 10);
+}
+module.exports.sub = sub;
+module.exports.subDate = subDate;
\ No newline at end of file