修改

config/index.js

@@ -14,7 +14,7 @@ module.exports = {
 
     // Various Dev Server settings
     // host: 'localhost', // can be overwritten by process.env.HOST
-    host: '192.168.100.73', // can be overwritten by process.env.HOST
+    host: '192.168.100.205', // can be overwritten by process.env.HOST
     port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/trainManage.js

@@ -13,10 +13,10 @@ export function trainList(query) {
 
 
 // 客户表彰审批
-export function complete(query) {
+export function complete(data) {
   return request({
     url: '/mall-train/admin/complete',
     method: 'post',
-    params:query
+    data
   })
 }

src/views/trainManage/ceoTrainList.vue

@@ -78,9 +78,9 @@
             </span>
           </el-popover>
         </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="120px" label="审核状态">
-        <template slot-scope="props">
+      </el-table-column> -->
+      <el-table-column align="center" min-width="120px" label="审核状态" prop="statusName">
+        <!-- <template slot-scope="props">
           <el-popover trigger="hover">
             <el-table :data="props.row.trainLogs" border size="mini">
               <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
@@ -89,8 +89,8 @@
             </el-table>
             <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
           </el-popover>
-        </template>
-      </el-table-column> -->
+        </template> -->
+      </el-table-column>
       <el-table-column align="center" label="操作" width="160px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="small" @click="handleClickView(scope.row, 'view')">查看</el-button>
@@ -259,7 +259,7 @@ export default {
         limit: 10,
         title: '',
         userName: '',
-        status: "20",
+        status: "30",
       },
       dialogVisible: false,
       dialogStatus: '',
@@ -284,7 +284,7 @@ export default {
     
     checked(val){
             if(val.flag == false){
-                if(!val.content){
+                if(!val.comment){
                     this.$alert("请输入审批内容", "提示", {
                         confirmButtonText: "确定",
                     });
@@ -295,10 +295,10 @@ export default {
         },
     complete(flag) {
             const parms = {
-                id:this.id,
-                addIntergral:this.dataForm.integral,
-                category:this.dataForm.category,
-                content: this.dataForm.content,
+                trainInfoId:this.id,
+                lecturerIntegral:this.dataForm.lecturerIntegral,
+                traineeIntegral:this.dataForm.traineeIntegral,
+                comment: this.dataForm.content,
                 flag:flag,
             }
             const isChecked = this.checked(parms);
@@ -333,7 +333,7 @@ export default {
       },
     
     getStatusTypeList() {
-      dataTypeList({ dictType: 'customer_treward_status' }).then(response => {
+      dataTypeList({ dictType: 'train_complete_status' }).then(response => {
         this.statusTypeList = response.data.data;
       }).catch(() => { });
     },

src/views/trainManage/operateTrainList.vue

@@ -78,9 +78,9 @@
             </span>
           </el-popover>
         </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="120px" label="审核状态">
-        <template slot-scope="props">
+      </el-table-column> -->
+      <el-table-column align="center" min-width="120px" label="审核状态" prop="statusName">
+        <!-- <template slot-scope="props">
           <el-popover trigger="hover">
             <el-table :data="props.row.trainLogs" border size="mini">
               <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
@@ -89,8 +89,8 @@
             </el-table>
             <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
           </el-popover>
-        </template>
-      </el-table-column> -->
+        </template> -->
+      </el-table-column>
       <el-table-column align="center" label="操作" width="160px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="small" @click="handleClickView(scope.row, 'view')">查看</el-button>
@@ -247,7 +247,7 @@ export default {
         limit: 10,
         title: '',
         userName: '',
-        status: "10",
+        status: "20",
       },
       dialogVisible: false,
       dialogStatus: '',
@@ -273,7 +273,7 @@ export default {
     },
     checked(val){
             if(val.flag == false){
-                if(!val.content){
+                if(!val.comment){
                     this.$alert("请输入审批内容", "提示", {
                         confirmButtonText: "确定",
                     });
@@ -285,9 +285,8 @@ export default {
         },
     complete(flag) {
             const parms = {
-                id:this.id,
-                category:this.dataForm.category,
-                content: this.dataForm.content,
+                trainInfoId:this.id,
+                comment: this.dataForm.content,
                 flag:flag,
             }
             const isChecked = this.checked(parms);
@@ -318,7 +317,7 @@ export default {
   
   
     getStatusTypeList() {
-      dataTypeList({ dictType: 'customer_treward_status' }).then(response => {
+      dataTypeList({ dictType: 'train_complete_status' }).then(response => {
         this.statusTypeList = response.data.data;
       }).catch(() => { });
     },

src/views/trainManage/trainList.vue

@@ -78,9 +78,9 @@
             </span>
           </el-popover>
         </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="120px" label="审核状态">
-        <template slot-scope="props">
+      </el-table-column> -->
+      <el-table-column align="center" min-width="120px" label="审核状态" prop="statusName">
+        <!-- <template slot-scope="props">
           <el-popover trigger="hover">
             <el-table :data="props.row.trainLogs" border size="mini">
               <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
@@ -89,8 +89,8 @@
             </el-table>
             <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
           </el-popover>
-        </template>
-      </el-table-column> -->
+        </template> -->
+      </el-table-column>
       <el-table-column align="center" label="操作" width="80px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="small" @click="handleClick(scope.row, 'view')">查看</el-button>
@@ -224,8 +224,6 @@ export default {
     return {
       tableData: [],
       dialogVisible: false,
-      categoryList: [],
-      typeList: [],
       statusTypeList: [],
       list: [],
       total: 0,
@@ -250,8 +248,6 @@ export default {
     };
   },
   created() {
-    this.getTypeList();
-    this.getCategoryList();
     this.getStatusTypeList();
     this.getList();
   },
@@ -262,18 +258,9 @@ export default {
       this.detailData = row;
       this.dialogVisible = true;
     },
-    getCategoryList() {
-      dataTypeList({ dictType: 'customer_treward_category' }).then(response => {
-        this.categoryList = response.data.data;
-      }).catch(() => { });
-    },
-    getTypeList() {
-      dataTypeList({ dictType: 'customer_treward_type' }).then(response => {
-        this.typeList = response.data.data;
-      }).catch(() => { });
-    },
+  
     getStatusTypeList() {
-      dataTypeList({ dictType: 'customer_treward_status' }).then(response => {
+      dataTypeList({ dictType: 'train_complete_status' }).then(response => {
         this.statusTypeList = response.data.data;
       }).catch(() => { });
     },