From 3b649ae9ccb00481b7b176323051b0152c5a3b44 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 29 Mar 2024 18:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E6=A3=80=E6=9F=A5=E6=9C=AA?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=A1=8C=E8=BD=A6=E5=89=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E8=BF=9B=E8=A1=8C=E8=A1=8C=E8=BD=A6=E4=B8=AD?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dirving-inspections-list.vue                 |  1 +
 .../driving-inspections/driving-item-list.vue    |  9 +++++++++
 pages/application/safetymeeting/home.vue         | 16 ++++++++--------
 .../safetymeeting/safetymeeting-detail.vue       | 11 +++++++++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/pages/application/driving-inspections/dirving-inspections-list.vue b/pages/application/driving-inspections/dirving-inspections-list.vue
index 429e7e8..eea9496 100644
--- a/pages/application/driving-inspections/dirving-inspections-list.vue
+++ b/pages/application/driving-inspections/dirving-inspections-list.vue
@@ -152,6 +152,7 @@
         this.getData()
       },
       reset (){
+        this.KEYWORDS = '';
         this.DEPT = '';
         this.DEPTNAME = '';
         this.list = [];
diff --git a/pages/application/driving-inspections/driving-item-list.vue b/pages/application/driving-inspections/driving-item-list.vue
index e0400da..ca48d4a 100644
--- a/pages/application/driving-inspections/driving-item-list.vue
+++ b/pages/application/driving-inspections/driving-item-list.vue
@@ -87,6 +87,7 @@
 					},
 					success: (res) => {
 						if ("success" == res.data.result) {
+              console.log(res.data,'1111111111111111111111111')
 							uni.hideLoading();
 							_this.list = res.data.varList;
 							_this.pd = res.data.pd;
@@ -114,6 +115,14 @@
 					});
 					return;
 				}else if((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '1' || this.pd.IsExist == '0') && index === 1){
+          if(this.pd.WAYBILLSTATUS === '0') {
+            uni.showModal({
+              title: '提示',
+              content:'未进行出车前检查，无法进行此操作',
+              showCancel: false,
+              confirmText: '确认'
+            });
+          }
 					return
 				}else if((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '2' || this.pd.IsExist == '0') && index === 2){
 					uni.showModal({
diff --git a/pages/application/safetymeeting/home.vue b/pages/application/safetymeeting/home.vue
index 38de609..61376da 100644
--- a/pages/application/safetymeeting/home.vue
+++ b/pages/application/safetymeeting/home.vue
@@ -3,9 +3,9 @@
 		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
 			<block slot="backText">返回</block>
 			<block slot="content">安全例会</block>
-			<block slot="right">
-				<view @click="showDrawer('showRight')">查询</view>
-			</block>
+<!--			<block slot="right">-->
+<!--				<view @click="showDrawer('showRight')">查询</view>-->
+<!--			</block>-->
 		</cu-custom>
 		<view class="select-fixed top-fixed">
 			<view class="cu-bar search bg-white">
@@ -64,7 +64,7 @@
 		},
 		data() {
 			return {
-				showRight: false,
+				// showRight: false,
 				dataFlag: 'noData',
 				sTop: 0,
         loginUser :'',
@@ -175,10 +175,10 @@
 				// this.isUps=true
 				this.$refs.tkiTree._show();
 			},
-			// 打开窗口
-			showDrawer(e) {
-				this.$refs[e].open()
-			},
+			// // 打开窗口
+			// showDrawer(e) {
+			// 	this.$refs[e].open()
+			// },
 			// 关闭窗口
 			closeDrawer(e) {
 				this.$refs[e].close()
diff --git a/pages/application/safetymeeting/safetymeeting-detail.vue b/pages/application/safetymeeting/safetymeeting-detail.vue
index a67aef7..50ffcf8 100644
--- a/pages/application/safetymeeting/safetymeeting-detail.vue
+++ b/pages/application/safetymeeting/safetymeeting-detail.vue
@@ -33,6 +33,17 @@
           <view class="dy-card-content-item">
             <text>会议内容：</text>
             <rich-text :nodes="pd.MEETING_CONTENT"></rich-text>
+          </view>
+          <view class="message-warp" v-if="pd.VIDEO_SIGN_ROUTE">
+            <video :src="pd.VIDEO_SIGN_ROUTE" controls="true"></video>
+          </view>
+          <view class="message-warp" v-if="pd.CONFIRM_MESSAGE_SIGN_ROUTE">
+            <view class="cu-item" @click="$noMultipleClicks(goStuToOpen,pd.CONFIRM_MESSAGE_SIGN_ROUTE)">
+              <view class="content">
+                <text class="cuIcon-read text-blue"></text>
+                <text class="text-grey">会议附件</text>
+              </view>
+            </view>
           </view>
 				</view>
 			</view>