修改

src/views/trainManage/ceoTrainList.vue

@@ -93,29 +93,10 @@
       </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>
-          <el-button type="success" size="small"
-            @click="handleClick(scope.row)">处理</el-button>
+          <el-button type="success" size="small" @click="handleClickView(scope.row, 'complete')">处理</el-button>
           </template>
       </el-table-column>
     </el-table>
-    <el-dialog :close-on-click-modal="false" title="培训审批" :visible.sync="dialogFormVisible" width="40%">
-            <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px">
-                <el-form-item label="讲师积分" prop="lecturerIntegral">
-                  <el-input-number style="width: 100%;" :min="10" :step="1" v-model="dataForm.lecturerIntegral"></el-input-number>
-                </el-form-item>
-                <el-form-item label="参加人积分" prop="traineeIntegral">
-                  <el-input-number style="width: 100%;" :min="10" :step="1" v-model="dataForm.traineeIntegral"></el-input-number>
-                </el-form-item>
-                <el-form-item label="审批意见" prop="content">
-                  <el-input type="textarea" :rows="2" placeholder="请输入审批意见" v-model="dataForm.content"></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="complete(true)">同意</el-button>
-                <el-button type="danger" @click="complete(false)">驳回</el-button>
-            </div>
-        </el-dialog>
     <!-- 分页 -->
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -199,6 +180,21 @@
         <el-table-column align="center" prop="createTime" label="处理时间" width="180">
         </el-table-column>
       </el-table>
+      <el-form style="margin-top: 20px;" :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px">
+                <el-form-item label="讲师积分" prop="lecturerIntegral">
+                  <el-input-number style="width: 100%;" :min="10" :step="1" v-model="dataForm.lecturerIntegral"></el-input-number>
+                </el-form-item>
+                <el-form-item label="参加人积分" prop="traineeIntegral">
+                  <el-input-number style="width: 100%;" :min="10" :step="1" v-model="dataForm.traineeIntegral"></el-input-number>
+                </el-form-item>
+                <el-form-item label="审批意见" prop="content">
+                  <el-input type="textarea" :rows="2" placeholder="请输入审批意见" v-model="dataForm.content"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="complete(true)">同意</el-button>
+                <el-button type="danger" @click="complete(false)">驳回</el-button>
+            </div>
     </el-dialog>
   </div>
 </template>
@@ -249,7 +245,7 @@ export default {
         lecturerIntegral: [{ required: true, message: "请填写积分", trigger: "blur" }],
         traineeIntegral: [{ required: true, message: "请填写积分", trigger: "blur" }],
       },
-      dialogFormVisible: false,
+      dialogVisible: false,
       statusTypeList: [],
       list: [],
       total: 0,
@@ -280,6 +276,11 @@ export default {
       this.dialogStatus = tag;
       this.detailData = row;
       this.dialogVisible = true;
+      this.id = row.id;
+        this.$nextTick(() => {
+            this.dataForm.content = '';
+            this.$refs["dataForm"].clearValidate();
+        });
     },
     
     checked(val){
@@ -310,27 +311,13 @@ export default {
                         type: "success",
                         duration: 2000,
                     });
-                    this.dialogFormVisible = false;
+                    this.dialogVisible = false;
                     this.getList();
                 })
                 .catch(() => { });
             }
             
         },
-      handleClick(val) {
-        this.dialogFormVisible = true;
-        this.id = val.id;
-        this.integral = val.integral;
-        
-        this.dataForm.typeName = val.typeName;
-        this.dataForm.category = val.category;
-        this.dataForm.integral = val.integral;
-        this.dataForm.type = val.type;
-        this.$nextTick(() => {
-            this.dataForm.content = '';
-            this.$refs["dataForm"].clearValidate();
-        });
-      },
     
     getStatusTypeList() {
       dataTypeList({ dictType: 'train_complete_status' }).then(response => {

src/views/trainManage/operateTrainList.vue

@@ -93,23 +93,10 @@
       </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>
-          <el-button type="success" size="small"
-            @click="handleClick(scope.row.id)">处理</el-button>
+          <el-button type="success" size="small" @click="handleClickView(scope.row, 'complete')">处理</el-button>
           </template>
       </el-table-column>
     </el-table>
-    <el-dialog :close-on-click-modal="false" title="培训审批" :visible.sync="dialogFormVisible" width="40%">
-            <el-form ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="80px">
-                <el-form-item label="审批意见" prop="content">
-                  <el-input type="textarea" :rows="2" placeholder="请输入审批意见" v-model="dataForm.content"></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="complete(true)">同意</el-button>
-                <el-button type="danger" @click="complete(false)">驳回</el-button>
-            </div>
-        </el-dialog>
     <!-- 分页 -->
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -193,6 +180,15 @@
         <el-table-column align="center" prop="createTime" label="处理时间" width="180">
         </el-table-column>
       </el-table>
+      <el-form style="margin-top: 20px;" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="80px">
+                <el-form-item label="审批意见" prop="content">
+                  <el-input type="textarea" :rows="2" placeholder="请输入审批意见" v-model="dataForm.content"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="complete(true)">同意</el-button>
+                <el-button type="danger" @click="complete(false)">驳回</el-button>
+            </div>
     </el-dialog>
   </div>
 </template>
@@ -237,7 +233,7 @@ export default {
       dataForm: {
         content: ''
       },
-      dialogFormVisible: false,
+      dialogVisible: false,
       statusTypeList: [],
       list: [],
       total: 0,
@@ -270,6 +266,11 @@ export default {
       this.dialogStatus = tag;
       this.detailData = row;
       this.dialogVisible = true;
+      this.id = row.id;
+        this.$nextTick(() => {
+            this.dataForm.content = '';
+            this.$refs["dataForm"].clearValidate();
+        });
     },
     checked(val){
             if(val.flag == false){
@@ -298,22 +299,13 @@ export default {
                         type: "success",
                         duration: 2000,
                     });
-                    this.dialogFormVisible = false;
+                    this.dialogVisible = false;
                     this.getList();
                 })
                 .catch(() => { });
             }
             
         },
-      handleClick(id) {
-        this.dialogFormVisible = true;
-        this.id = id;
-        this.$nextTick(() => {
-            this.dataForm.category = '';
-            this.dataForm.content = '';
-            this.$refs["dataForm"].clearValidate();
-        });
-      },
   
   
     getStatusTypeList() {