From 8b55f34800ba951e5c0c201e2e419ba856fb6b8c Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Wed, 27 Dec 2023 14:16:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/riskwarning/riskadvisorycard/index.vue | 4 ++++
 src/views/riskwarning/riskfour/index.vue         | 4 ++++
 src/views/riskwarning/riskpeoples/index.vue      | 4 ++++
 src/views/riskwarning/riskthreepeople/index.vue  | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/src/views/riskwarning/riskadvisorycard/index.vue b/src/views/riskwarning/riskadvisorycard/index.vue
index 35358d6..063211e 100644
--- a/src/views/riskwarning/riskadvisorycard/index.vue
+++ b/src/views/riskwarning/riskadvisorycard/index.vue
@@ -302,6 +302,10 @@ export default {
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
+          this.$message({
+            message: '批量删除成功',
+            type: 'success'
+          })
           this.getList()
         }).catch((e) => {
           this.listLoading = false
diff --git a/src/views/riskwarning/riskfour/index.vue b/src/views/riskwarning/riskfour/index.vue
index b130556..20783fc 100644
--- a/src/views/riskwarning/riskfour/index.vue
+++ b/src/views/riskwarning/riskfour/index.vue
@@ -305,6 +305,10 @@ export default {
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
+          this.$message({
+            message: '批量删除成功',
+            type: 'success'
+          })
           this.getList()
         }).catch((e) => {
           this.listLoading = false
diff --git a/src/views/riskwarning/riskpeoples/index.vue b/src/views/riskwarning/riskpeoples/index.vue
index 50fe20c..65358d4 100644
--- a/src/views/riskwarning/riskpeoples/index.vue
+++ b/src/views/riskwarning/riskpeoples/index.vue
@@ -305,6 +305,10 @@ export default {
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
+          this.$message({
+            message: '批量删除成功',
+            type: 'success'
+          })
           this.getList()
         }).catch((e) => {
           this.listLoading = false
diff --git a/src/views/riskwarning/riskthreepeople/index.vue b/src/views/riskwarning/riskthreepeople/index.vue
index 9eff585..e1a3e49 100644
--- a/src/views/riskwarning/riskthreepeople/index.vue
+++ b/src/views/riskwarning/riskthreepeople/index.vue
@@ -305,6 +305,10 @@ export default {
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
+          this.$message({
+            message: '批量删除成功',
+            type: 'success'
+          })
           this.getList()
         }).catch((e) => {
           this.listLoading = false

From 7da0125aadc36c9e87c1eddc5b7a433c5f8230bf Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Wed, 27 Dec 2023 14:23:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E5=8A=A0*=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/riskwarning/riskadvisorycard/index.vue | 5 +++--
 src/views/riskwarning/riskfour/index.vue         | 5 +++--
 src/views/riskwarning/riskpeoples/index.vue      | 5 +++--
 src/views/riskwarning/riskthreepeople/index.vue  | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/riskwarning/riskadvisorycard/index.vue b/src/views/riskwarning/riskadvisorycard/index.vue
index 063211e..f9f1656 100644
--- a/src/views/riskwarning/riskadvisorycard/index.vue
+++ b/src/views/riskwarning/riskadvisorycard/index.vue
@@ -72,7 +72,7 @@
         <el-form-item label="文件名" prop="NAME">
           <el-input v-model="form.NAME" placeholder="这里输入名称..." />
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item label="附件" prop="FILE">
           <el-upload
             ref="upload"
             :on-preview="handlePictureCardPreview"
@@ -131,7 +131,8 @@ export default {
         FFILE: []
       },
       rules: {
-        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
+        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
       }
     }
   },
diff --git a/src/views/riskwarning/riskfour/index.vue b/src/views/riskwarning/riskfour/index.vue
index 20783fc..fbef217 100644
--- a/src/views/riskwarning/riskfour/index.vue
+++ b/src/views/riskwarning/riskfour/index.vue
@@ -72,7 +72,7 @@
         <el-form-item label="文件名" prop="NAME">
           <el-input v-model="form.NAME" placeholder="这里输入名称..." />
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item label="附件" prop="FILE">
           <el-upload
             ref="upload"
             :on-preview="handlePictureCardPreview"
@@ -131,7 +131,8 @@ export default {
         FFILE: []
       },
       rules: {
-        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
+        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
       }
     }
   },
diff --git a/src/views/riskwarning/riskpeoples/index.vue b/src/views/riskwarning/riskpeoples/index.vue
index 65358d4..85b28be 100644
--- a/src/views/riskwarning/riskpeoples/index.vue
+++ b/src/views/riskwarning/riskpeoples/index.vue
@@ -72,7 +72,7 @@
         <el-form-item label="文件名" prop="NAME">
           <el-input v-model="form.NAME" placeholder="这里输入名称..." />
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item label="附件" prop="FILE">
           <el-upload
             ref="upload"
             :on-preview="handlePictureCardPreview"
@@ -131,7 +131,8 @@ export default {
         FFILE: []
       },
       rules: {
-        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
+        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
       }
     }
   },
diff --git a/src/views/riskwarning/riskthreepeople/index.vue b/src/views/riskwarning/riskthreepeople/index.vue
index e1a3e49..7a9da05 100644
--- a/src/views/riskwarning/riskthreepeople/index.vue
+++ b/src/views/riskwarning/riskthreepeople/index.vue
@@ -72,7 +72,7 @@
         <el-form-item label="文件名" prop="NAME">
           <el-input v-model="form.NAME" placeholder="这里输入名称..." />
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item label="附件" prop="FILE">
           <el-upload
             ref="upload"
             :on-preview="handlePictureCardPreview"
@@ -131,7 +131,8 @@ export default {
         FFILE: []
       },
       rules: {
-        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
+        NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        FILE: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
       }
     }
   },

From ab1cd79df54aa66910c395c14150d941b3f37b80 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 27 Dec 2023 15:13:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue      | 1 +
 src/views/xgf/flowApply/components/apply.vue    | 2 ++
 src/views/xgf/flowApply/components/userInfo.vue | 1 +
 src/views/xgf/flowList/components/list.vue      | 1 -
 src/views/xgf/flow_audit/index.vue              | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 720da2f..e8acab1 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -44,6 +44,7 @@ export default {
       this.heirloom = JSON.stringify(e)
     },
     beforeClose() {
+      this.visible = false
     },
     sendMessage(row) {
       if (!this.value || this.value === '') {
diff --git a/src/views/xgf/flowApply/components/apply.vue b/src/views/xgf/flowApply/components/apply.vue
index 3c96882..8627ecb 100644
--- a/src/views/xgf/flowApply/components/apply.vue
+++ b/src/views/xgf/flowApply/components/apply.vue
@@ -301,10 +301,12 @@ export default {
     },
     handleClose() {
       this.visible = false
+      this.form = {}
       this.$emit('refresh', '')
     },
     closeWindow() {
       this.visible = false
+      this.form = {}
     }
   }
 }
diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index 3b7e987..bb3a701 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -154,6 +154,7 @@
               <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
               <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
               <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+              <el-table-column prop="TRAINING_HOURS" label="培训学时" align="center"/>
               <el-table-column label="培训有效期" align="center">
                 <template slot-scope="{row}">
                   <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
diff --git a/src/views/xgf/flowList/components/list.vue b/src/views/xgf/flowList/components/list.vue
index 9b09550..a6ffa55 100644
--- a/src/views/xgf/flowList/components/list.vue
+++ b/src/views/xgf/flowList/components/list.vue
@@ -141,7 +141,6 @@ export default {
         '/trainingbatch/userList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
-          STATUS: '2',
           EMPLOY_FLAG: '1',
           VALID_FLAG: '1'
         }
diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index c159d43..d2de9ba 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -7,7 +7,7 @@ flowTrain/batchList<template>
             <el-input v-model="XGF_NAME" placeholder="相关方名称"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="委托时间">
             <el-date-picker
               v-model="dates"