审核更新

.env.development

@@ -2,8 +2,8 @@
 ENV='development'
 
 # base api
-VUE_APP_BASE_API=https://suzhoukeji-test.ali251.langye.net
+#VUE_APP_BASE_API=https://suzhoukeji-test.ali251.langye.net
-VUE_APP_UPLOAD_API=https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
+#VUE_APP_UPLOAD_API=https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file
 
-#VUE_APP_BASE_API = https://wx.sstbc.com
+VUE_APP_BASE_API = https://wx.sstbc.com
-#VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file
+VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file

src/components/LxHeader/index.vue

@@ -10,7 +10,8 @@
       <template v-else>
         <Icon size="20" :type="$route.meta.icon" />
       </template>
-      <span>{{text || $route.meta.title}}</span>
+      <span v-if="text">{{text || $route.meta.title}}</span>
+      <slot v-else name="textcontent"></slot>
     </div>
     <div class="content">
       <slot name="content"></slot>

src/utils/common.js

@@ -1,6 +1,7 @@
 import {
   Message
 } from 'element-ui'
+import moment from "moment"
 let base = {
   showMessage(msg,type){
     return Message({
@@ -48,6 +49,13 @@ let base = {
 
     return maskedPhoneNumber;
   },
+  formatDate(date){
+    if(this.isNull(date)){
+      return "-"
+    }else{
+      return moment(date).format('YYYY-MM-DD HH:mm:ss')
+    }
+  },
   checkUrl (url) {
     // url= 协议://(ftp的登录信息)[IP|域名](:端口号)(/或?请求参数)
     var strRegex =

src/views/course/apply_list.vue

@@ -94,9 +94,12 @@
 
                   <el-button type="primary" size="small" @click="importTable">导入</el-button>
                   <el-button style="margin-right:10px" type="primary" size="small" @click="exportExcel">导出</el-button>
-                  <el-popconfirm @confirm="updateAllStatus" title="确定要批量审核吗？">
+                  <el-popconfirm @confirm="updateAllStatus(1)" title="确定要批量审核吗？">
-                    <el-button type="primary" size="small" slot="reference">批量审核</el-button>
+                    <el-button style="margin-right:10px" type="primary" size="small" slot="reference">批量审核通过</el-button>
                   </el-popconfirm>
+                  <!-- <el-popconfirm @confirm="updateAllStatus(2)" title="确定要批量审核吗？"> -->
+                    <el-button @click="updateAllStatus(2)" type="warning" size="small" slot="reference">批量审核不通过</el-button>
+                  <!-- </el-popconfirm> -->
                 </div>
               </div>
 
@@ -121,6 +124,16 @@
             </template>
           </el-table-column>
         </template>
+        <template v-slot:username>
+          <el-table-column align='center' label="姓名" width="120" header-align="center">
+            <template slot-scope="scope">
+              <div>{{scope.row.user.username}}</div>
+              <div style="color:red" v-if="scope.row.change_data && scope.row.change_data.length>0">
+                报名信息有变更
+              </div>
+            </template>
+          </el-table-column>
+        </template>
         <template v-slot:status>
           <el-table-column align='center' label="状态" width="120" header-align="center">
             <template slot-scope="scope">
@@ -145,9 +158,13 @@
       </xy-table>
     </div>
 
+    <!-- 批量审核不通过 -->
+
+
     <student-detail ref="studentDetail" @refresh="getList"></student-detail>
     <imports ref="imports" :course_id="subjectObj.id" :status="0" :table-name="'course_signs'" @refresh="getList">
     </imports>
+    <updateStaturReason ref="updateStaturReason" @refresh="getList"></updateStaturReason>
 
   </div>
 </template>
@@ -165,12 +182,13 @@
   import {
     download
   } from "@/utils/downloadRequest";
-
+  import updateStaturReason from "./components/updateStaturReason.vue"
   export default {
     mixins: [myMixins, formMixin],
     components: {
       studentDetail,
-      imports
+      imports,
+      updateStaturReason
     },
     data() {
       return {
@@ -216,7 +234,7 @@
             fixed: 'left'
           },
           {
-            prop: 'user.username',
+            prop: 'username',
             label: '姓名',
             align: 'center',
             width: 120,
@@ -390,10 +408,19 @@
           return
         }
         let ids = this.selectids.join(',')
+        if(status==2){
+          this.$refs.updateStaturReason.setIds({
+              course_id: this.select.course_id,
+              ids: ids,
+              status: status,
+          })
+          this.$refs.updateStaturReason.isShow = true
+          return
+        }
         updateStatus({
           course_id: this.select.course_id,
           ids: ids,
-          status: 1,
+          status: status,
         }).then(res => {
           this.$Message.success('审核成功')
           this.getList()

src/views/course/components/updateStaturReason.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+    <xy-dialog ref="dialog" :width="60" :is-show.sync="isShow" :type="'form'" title="批量审核不通过"
+      :form="form" :rules='rules' @submit="submit">
+      <template v-slot:reason>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>备注：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input type="textarea" :rows="5" v-model="form.reason" placeholder="请输入备注(展示给学员查看)"></el-input>
+          </div>
+        </div>
+      </template>
+
+    </xy-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    updateStatus
+  } from '@/api/apply/index.js'
+  export default {
+    components: {
+
+    },
+    data() {
+      return {
+        isShow: false,
+        id: '',
+        form: {
+          reason: '',
+        },
+        ids_obj:{
+          ids:'',
+          status:2,
+          course_id:''
+        },
+        rules: {
+          reason:[{
+            required: true,
+            message: '请输入备注'
+          }],
+        }
+      }
+    },
+    created() {
+    },
+    methods: {
+      setIds(e){
+        this.ids_obj = e
+      },
+      submit() {
+        if(this.base.isNull(this.form.reason)){
+          this.$message({
+            type:'warning',
+            message:'请输入备注'
+          })
+          return
+        }
+
+        console.log(this.ids_obj,this.form.reason)
+        // return
+        updateStatus({
+          course_id: this.ids_obj.course_id,
+          ids: this.ids_obj.ids,
+          status: this.ids_obj.status,
+          reason:this.form.reason
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '批量审核不通过，设置成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+      },
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+        } else {
+          this.ids_obj = {
+            ids:'',
+            status:2,
+            course_id:''
+          },
+          this.$refs['dialog'].reset()
+        }
+      },
+    }
+
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .reason{
+    flex-basis: 100%;
+  }
+</style>

src/views/student/components/detail.vue

@@ -13,8 +13,14 @@
               <div>课程体系：{{subjectObj.leibie}}</div>
             </div>
             <div>
-              <lx-header icon="" :text="type=='checkshow' || type=='check'?'报名信息':'个人信息'"
+              <lx-header icon="" :text="''"
                 style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+                <template v-slot:textcontent>
+                  <span>{{type=='checkshow' || type=='check'?'报名信息':'个人信息'}}</span>
+                  <span v-if="type=='checkshow' || type=='check'">
+                    （注：<span style="color:red">红色标识</span>为学员本次报名提交的信息，<span style="color:#000">黑色标识</span>为学员过往信息）
+                  </span>
+                </template>
               </lx-header>
               <div>
                 <el-descriptions class="margin-top" :column="2" border>
@@ -77,6 +83,64 @@
 
               </div>
 
+              <!-- 操作日志 -->
+              <lx-header v-if="(type=='checkshow' || type=='check') &&(sign_result.audits && sign_result.audits.length>0)" icon="" text="操作日志"
+                style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+              </lx-header>
+              <div v-if="(type=='checkshow' || type=='check') &&(sign_result.audits && sign_result.audits.length>0)">
+                <xy-table :list="sign_result.audits" :isPage="false" height="200" :table-item="audit_item">
+                  <template v-slot:username>
+                    <el-table-column align='center' label="操作人" width="120" header-align="center">
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.event=='created'">
+                          学员本身
+                        </div>
+                        <div v-else>
+                          {{scope.row.user?scope.row.user.username:''}}
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </template>
+                  <template v-slot:event>
+                    <el-table-column align='center' label="操作类型" width="120" header-align="center">
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.event=='created'">
+                          提交报名
+                        </div>
+                        <div v-else>
+                          更新状态
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </template>
+                  <template v-slot:values>
+                    <el-table-column align='left' label="操作详情" header-align="center">
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.event=='created'">
+                          提交报名信息
+                        </div>
+                        <div v-else>
+                          <template v-for="item in apply_status_list">
+                            <span style="font-weight: bold;" v-if="scope.row.old_values.status===item.id">{{item.value}}</span>
+                          </template>
+                          变更为：
+                          <template v-for="item in apply_status_list">
+                            <span style="color:red" v-if="scope.row.new_values.status===item.id">{{item.value}}</span>
+                          </template>
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </template>
+                  <template v-slot:created_at>
+                    <el-table-column align='center' label="操作时间" width="240" header-align="center">
+                      <template slot-scope="scope">
+                        {{base.formatDate(scope.row.created_at)}}
+                      </template>
+                    </el-table-column>
+                  </template>
+                </xy-table>
+              </div>
+
 
               <!-- 审核查看 -->
               <lx-header v-if="type=='checkshow' || type=='check'" icon="" text="审核结果"
@@ -276,6 +340,23 @@
           reason: '',
           position: ''
         },
+        audit_item:[{
+          prop:'username',
+          label:'操作人'
+        },{
+          prop:'ip_address',
+          label:'Ip',
+          width:120
+        },{
+          prop:'event',
+          label:'操作类型'
+        },{
+          prop:'values',
+          label:'操作详情'
+        },{
+          prop:'created_at',
+          label:'操作时间'
+        },],
       }
     },
     created() {},
@@ -306,6 +387,18 @@
         if (this.id) {
           this.form.id = this.id
         }
+
+        // 如果是 不通过， remark必填
+        if(this.form.status===2){
+          if(this.base.isNull(this.form.reason)){
+            this.$message({
+              type: 'warning',
+              message: '审核不通过时，请填写备注'
+            })
+            return
+          }
+        }
+
         let _arr = []
         if (this.fileList.length > 0) {
           this.fileList.map(item => {