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 @@
返回
安全例会
-
- 查询
-
+
+
+
@@ -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 @@
会议内容:
+
+
+
+
+
+
+
+
+ 会议附件
+
+