From d6fa13b343149ffc843cab87bd133686610907aa Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Thu, 26 Aug 2021 22:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/checkjob/detail.wxml  | 26 +++++++++++++++-----------
 pages/checkjob/index.wxml   | 37 ++++++++++++++++++++-----------------
 pages/checkjob/job.wxml     | 20 +++++++++-----------
 pages/checkjob/yanshou.wxml | 26 +++++++++++++++-----------
 pages/train/train.wxml      |  1 +
 5 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/pages/checkjob/detail.wxml b/pages/checkjob/detail.wxml
index 8fefe37..fab5c97 100644
--- a/pages/checkjob/detail.wxml
+++ b/pages/checkjob/detail.wxml
@@ -15,6 +15,14 @@
     <view class="weui-cell__ft">
       {{checkname__name}}
     </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" style="width:200px">
+      {{checktask__checkplace}}
+    </view>
   </view>
    <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
@@ -36,7 +44,7 @@
     <view class="weui-cell__bd weui-cell_primary">
       <view>检查问题</view>
     </view>
-    <view class="weui-cell__ft" style="width:200px">
+    <view class="weui-cell__ft" style="width:200px" wx:if="{{checkquestion}}">
       {{checkquestion}}
     </view>
   </view>
@@ -75,20 +83,16 @@
   </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" style="width:200px">
-      {{taskstate==1?'正在检查':'检查完毕'}}
-    </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" style="width:200px">
-      {{checktask__checkplace}}
+      <span wx:if="{{taskstate == 1}}" style="color:red;font-weight:bold">整改中</span>
+      <span wx:if="{{taskstate == 2}}" style="color:darkblue;font-weight:bold">整改完成</span>
+      <span wx:if="{{taskstate == 3}}" style="color:green;font-weight:bold">任务关闭</span>
+      <span wx:if="{{taskstate == 4}}" style="color:orange;font-weight:bold">待执行</span>
     </view>
   </view>
+
   <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
       <view>经验教训</view>
diff --git a/pages/checkjob/index.wxml b/pages/checkjob/index.wxml
index 3663804..623d5b1 100644
--- a/pages/checkjob/index.wxml
+++ b/pages/checkjob/index.wxml
@@ -20,18 +20,18 @@
                 {{item.checktask__checktaskname}} 
               </view>
               <view class="weui-media-box__desc">
-                <span style="background-color:orange;color:white"></span>
+                <view>执行人:<span style="color:darkblue">{{item.checkname__name}} </span></view>
                   <view class="weui-media-box__title" wx:if="{{item.jobstate == 1}}" style="font-size:12px;color:green">可执行</view>
-                 <view class="weui-media-box__title" wx:if="{{item.jobstate == 2}}" style="font-size:12px;color:red">已过期</view>
+                 <!-- <view class="weui-media-box__title" wx:if="{{item.jobstate == 2}}" style="font-size:12px;color:red">已过期</view> -->
               </view>
               <view class="weui-media-box__desc">任务开始时间:{{item.starttime}}</view>
               <view class="weui-media-box__desc">任务过期时间:{{item.endtime}}</view>
             </view>
             <view class="weui-panel__ft weui-cell__ft_in-access">
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="background-color:blue;color:white">正在检查</view>
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 2}}" style="background-color:yellow">检查完毕</view>
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 3}}" style="background-color:orange">任务关闭</view>
-                <view class="weui-media-box__title" wx:if="{{item.taskstate == 4}}" style="background-color:green">未执行</view>
+              <view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="color:red;font-weight:bold">整改中</view>
+              <view class="weui-media-box__title" wx:if="{{item.taskstate == 2}}" style="color:darkblue;font-weight:bold">整改完成</view>
+              <view class="weui-media-box__title" wx:if="{{item.taskstate == 3}}" style="color:green;font-weight:bold">任务关闭</view>
+                <view class="weui-media-box__title" wx:if="{{item.taskstate == 4}}" style="color:orange;font-weight:bold">待执行</view>
               
             </view>
           </navigator>
@@ -50,17 +50,18 @@
                 
               </view>
               <view class="weui-media-box__desc">
-                 <span style="background-color:green;color:white">{{item.checkname__name}} </span>
+                  <view>执行人:<span style="color:darkblue">{{item.checkname__name}} </span></view>
                   <view class="weui-media-box__title" wx:if="{{item.jobstate == 1}}" style="font-size:12px;color:green">可执行</view>
-                 <view class="weui-media-box__title" wx:if="{{item.jobstate == 2}}" style="font-size:12px;color:red">已过期</view>
+                 <!-- <view class="weui-media-box__title" wx:if="{{item.jobstate == 2}}" style="font-size:12px;color:red">已过期</view> -->
               </view>
               <view class="weui-media-box__desc">任务开始时间:{{item.starttime}}</view>
               <view class="weui-media-box__desc">任务过期时间:{{item.endtime}}</view>
             </view>
             <view class="weui-panel__ft weui-cell__ft_in-access">
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="background-color:green;color:white">正在检查</view>
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 2}}" style="background-color:red">检查完毕</view>
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 3}}" style="background-color:orange">任务关闭</view>
+              <view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="color:red;font-weight:bold">整改中</view>
+              <view class="weui-media-box__title" wx:if="{{item.taskstate == 2}}" style="color:darkblue;font-weight:bold">整改完成</view>
+              <view class="weui-media-box__title" wx:if="{{item.taskstate == 3}}" style="color:green;font-weight:bold">任务关闭</view>
+                <view class="weui-media-box__title" wx:if="{{item.taskstate == 4}}" style="color:orange;font-weight:bold">待执行</view>
               
             </view>
           </navigator>
@@ -80,19 +81,21 @@
                  
               </view>
               <view class="weui-media-box__desc">
-               
+                <view>执行人:<span style="color:darkblue">{{item.checkname__name}} </span></view>
                  <view class="weui-media-box__title" wx:if="{{item.jobstate == 1}}" style="font-size:12px;color:green">可执行</view>
-                 <view class="weui-media-box__title" wx:if="{{item.jobstate == 2}}" style="font-size:12px;color:red">已过期</view>
+                 <!-- <view class="weui-media-box__title" wx:if="{{item.jobstate == 2}}" style="font-size:12px;color:red">已过期</view> -->
                 
               </view>
               <view class="weui-media-box__desc">任务开始时间:{{item.starttime}}</view>
               <view class="weui-media-box__desc">任务过期时间:{{item.endtime}}</view>
             </view>
             <view class="weui-panel__ft weui-cell__ft_in-access">
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="background-color:blue;color:white">正在检查</view>
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 2}}" style="background-color:yellow">检查完毕</view>
-              <view class="weui-media-box__title" wx:if="{{item.taskstate == 3}}" style="background-color:orange">任务关闭</view>
-              
+              <view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="color:red;font-weight:bold">整改中</view>
+              <view class="weui-media-box__title" wx:elif="{{item.taskstate == 2}}" style="color:darkblue;font-weight:bold">整改完成</view>
+              <view class="weui-media-box__title" wx:elif="{{item.taskstate == 3}}" style="color:green;font-weight:bold">任务关闭</view>
+              <view class="weui-media-box__title" wx:elif="{{item.taskstate == 4}}" style="color:orange;font-weight:bold">待执行</view>
+              <view class="weui-media-box__title" wx:elif="{{item.taskstate == 4}}" style="color:orange;font-weight:bold">待执行</view>
+              <view class="weui-media-box__desc" wx:if="{{item.yanshou}}" style="color:green;font-weight:bold">已验收</view>
             </view>
           </navigator>
         </block>
diff --git a/pages/checkjob/job.wxml b/pages/checkjob/job.wxml
index 5e2c3b6..b66a58b 100644
--- a/pages/checkjob/job.wxml
+++ b/pages/checkjob/job.wxml
@@ -20,6 +20,14 @@
 					{{checkname__name}}
 				</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" style="width:200px">
+					{{checktask__checkplace}}
+				</view>
+			</view>
 			<view class="weui-cell weui-cell_access">
 				<view class="weui-cell__bd weui-cell_primary">
 					<view>检查时间</view>
@@ -36,16 +44,6 @@
 					{{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" style="width:200px">
-					{{checktask__checkplace}}
-				</view>
-			</view>
-
 			<view class="weui-cells__title">检查问题</view>
 			<view class="weui-cells weui-cells_after-title">
 				<view class="weui-cell">
@@ -112,7 +110,7 @@
 
     <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
-      <view>检查状态</view>
+      <view>工作状态</view>
     </view>
   <view class="section section_gap">
             <radio-group class="radio-group" bindchange="radioChange">
diff --git a/pages/checkjob/yanshou.wxml b/pages/checkjob/yanshou.wxml
index 9076f0a..f42219f 100644
--- a/pages/checkjob/yanshou.wxml
+++ b/pages/checkjob/yanshou.wxml
@@ -19,6 +19,14 @@
     <view class="weui-cell__ft">
       {{checkname__name}}
     </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" style="width:200px">
+      {{checktask__checkplace}}
+    </view>
   </view>
    <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
@@ -40,7 +48,7 @@
     <view class="weui-cell__bd weui-cell_primary">
       <view>检查问题</view>
     </view>
-    <view class="weui-cell__ft" style="width:200px">
+    <view class="weui-cell__ft" style="width:200px" wx:if="{{checkquestion}}">
       {{checkquestion}}
     </view>
   </view>
@@ -81,17 +89,13 @@
       <view>检查状态</view>
     </view>
     <view class="weui-cell__ft" style="width:200px">
-      {{taskstate==1?'正在检查':'检查完毕'}}
-    </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" style="width:200px">
-      {{checktask__checkplace}}
+      <span wx:if="{{taskstate == 1}}" style="color:red;font-weight:bold">整改中</span>
+      <span wx:if="{{taskstate == 2}}" style="color:darkblue;font-weight:bold">整改完成</span>
+      <span wx:if="{{taskstate == 3}}" style="color:green;font-weight:bold">任务关闭</span>
+      <span wx:if="{{taskstate == 4}}" style="color:orange;font-weight:bold">待执行</span>
     </view>
   </view>
+
   <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
       <view>经验教训</view>
@@ -125,7 +129,7 @@
     </view>
   </view>
    <view class="btn-area">
-   <button class="weui-btn" type="primary" bindtap="submit">验收</button>
+   <button class="weui-btn" type="primary" bindtap="submit" wx:if="{{yanshou==null}}">验收</button>
   </view>
   </view>
  </view>
diff --git a/pages/train/train.wxml b/pages/train/train.wxml
index 8c7ffc9..5bb0b47 100644
--- a/pages/train/train.wxml
+++ b/pages/train/train.wxml
@@ -61,6 +61,7 @@
               <view class="weui-media-box__title" wx:if="{{item.checked == 0}}">未签到</view>
               <view class="weui-media-box__title" wx:if="{{item.train__state == 0}}">待评估</view>
               <view class="weui-media-box__title" wx:if="{{item.train__state == 1}}">已关闭</view>
+              <button size="mini" bindtap="goAssess" data-item="{{item}}" type="primary">评价</button>
               <!-- <view wx:if="{{item.todouser__name != null}}">
                     <view class="weui-media-box__desc">{{item.todouser__name}}</view>
                   </view> -->