From 11c158477bee74096effaa2e2f014163b9f9739e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 1 Mar 2024 13:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8A=9E=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=88=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=BA=EF=BC=9A=E7=8F=AD=E7=BA=A7=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=91=E5=8C=85=E5=8D=95=E4=BD=8D=E7=A1=AE=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/classMessage/components/edit.vue      |  6 ++----
 .../classMessage/classMessage/components/user.vue      |  2 +-
 src/views/xgf/flow/components/sendUtil.vue             | 10 +++++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/edit.vue b/src/views/classMessage/classMessage/components/edit.vue
index 5ea6e94..d6116d3 100644
--- a/src/views/classMessage/classMessage/components/edit.vue
+++ b/src/views/classMessage/classMessage/components/edit.vue
@@ -59,8 +59,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="培训有效期" prop="VALIDITY_PERIOD">
+        <el-col v-if="false" :span="12">
+          <el-form-item v-if="false" label="培训有效期" prop="VALIDITY_PERIOD">
             <el-date-picker
               v-model="form.VALIDITY_PERIOD"
               :disabled="isShow"
@@ -226,8 +226,6 @@ export default {
         return
       }
       this.form.list = JSON.stringify(this.peopleList)
-      this.form.VALIDITY_PERIOD_START = this.form.VALIDITY_PERIOD[0]
-      this.form.VALIDITY_PERIOD_END = this.form.VALIDITY_PERIOD[1]
       this.$refs.form.validate((valid) => {
         if (valid) {
           requestFN(
diff --git a/src/views/classMessage/classMessage/components/user.vue b/src/views/classMessage/classMessage/components/user.vue
index bc9badb..ac90c53 100644
--- a/src/views/classMessage/classMessage/components/user.vue
+++ b/src/views/classMessage/classMessage/components/user.vue
@@ -55,7 +55,7 @@
                 <div class="text textone">所在单位</div>
               </td>
               <td colspan="3">
-                <div class="text">{{ item.DEPARTMENT_NAME }}</div>
+                <div class="text">{{ item.BELONG_TO_CORP_NAME }}</div>
               </td>
               <td rowspan="3" style="padding-top: 6px" @click="click()">
                 <vue-qr :text="qrCodeStr" :margin="0" :size="110" color-dark="#000" color-light="#fff"/>
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index b8ced0b..bce14c7 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -39,6 +39,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col v-if="form.STATUS === '1' && !form.STEP " :span="12">
+            <el-form-item v-if="form.STATUS === '1'" prop="LIMIT_END_TIME" label="指定培训有效截至时间:">
+              <el-date-picker v-model="form.LIMIT_END_TIME" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:300px "/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -77,6 +82,7 @@ export default {
         APPOINT_USER_NAME: '',
         OPINION: '',
         STEP: false,
+        LIMIT_END_TIME: '',
         user: '',
         tm: new Date().getTime(),
         list: [],
@@ -95,6 +101,9 @@ export default {
         ],
         OPINION: [
           { required: true, message: '请填写打回原因', trigger: 'change' }
+        ],
+        LIMIT_END_TIME: [
+          { required: true, message: '请选择指定培训有效截至时间', trigger: 'change' }
         ]
       },
       heirloom: {},
@@ -113,7 +122,6 @@ export default {
   },
   methods: {
     async init(e) {
-      console.log(e)
       this.loading = true
       this.visible = true
       this.heirloom = JSON.stringify(e)