pssr 优化

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -407,6 +407,7 @@ public class TPssrApproveController extends BaseController {
                     case "exchanger":
                         TPssrOverhaulExchanger exchanger = new TPssrOverhaulExchanger();
                         exchanger.setSubId(dto.getSubId());
+                        exchanger.setDevType(Long.valueOf(dto.getDevType()));
                         exchanger.setIds(dto.getIds());
                         return exchangerController.confirmExchanger(exchanger);
                     case "filter":

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -324,6 +324,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
             exchanger.setSubId(tPssrOverhaulExchanger.getSubId());
             exchanger.setConfirmedPerson(getUserId().toString());
             exchanger.setApproveStatus(1L);
+            exchanger.setDevType(tPssrOverhaulExchanger.getDevType());
             for (TPssrOverhaulExchanger overhaulExchanger : tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(exchanger)) {
                 overhaulExchanger.setCompletionDate(new Date());
                 overhaulExchanger.setApproveStatus(2L);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProgrammeController.java

@@ -395,8 +395,8 @@ public class TPssrProgrammeController extends BaseController {
             test.setFileUrl(url);
             test.setFileName(file.getOriginalFilename());
             test.setWriteDone("Y");
-            test.setCheckDone("N");
-            test.setTrainDone("N");
+            test.setCheckDone("Y");
+            test.setTrainDone("Y");
             test.setApproveStatus(0L);
             test.setCreatedate(new Date());
             test.setCreaterCode(getUserId().toString());

ui/src/views/pssr/programme/index.vue

@@ -148,13 +148,19 @@
       </el-table-column>
       <el-table-column label="编写完成(Y/N)" align="center" prop="writeDone" :show-overflow-tooltip="true"/>
       <el-table-column label="核准完成(Y/N)" align="center" prop="checkDone" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训完成(Y/N)" align="center" prop="trainDone" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true">
+      <el-table-column label="培训完成(Y/N)" align="center" prop="trainDone" :show-overflow-tooltip="true" width="150">
+        <template slot-scope="scope">
+          <el-button type="success" circle v-if="scope.row.trainDone=='Y'" @click="toTrain(scope.row.trainingId)">{{ scope.row.trainDone }}
+          </el-button>
+          <span v-else>{{ scope.row.trainDone }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="核准完成人1" align="center" prop="confirm1" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true">
+      <el-table-column label="核准完成人2" align="center" prop="confirm2" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm2Name }}</span>
         </template>
@@ -311,7 +317,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
+        <el-form-item label="时间" v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"
@@ -328,7 +334,7 @@
         <el-button @click="cancelBatch">取 消</el-button>
       </div>
     </el-dialog>
-      <!-- 用户导入对话框 -->
+    <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload
@@ -360,14 +366,14 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
-  <!-- 驳回原因对话框 -->
+    <!-- 驳回原因对话框 -->
     <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="reason.open" append-to-body title="驳回"
                width="1000px">
-      <el-table  :data="items" border>
-        <el-table-column label="标题" align="center" prop="fileName"   :show-overflow-tooltip="true"/>
+      <el-table :data="items" border>
+        <el-table-column label="标题" align="center" prop="fileName" :show-overflow-tooltip="true"/>
         <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+            <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
           </template>
         </el-table-column>
       </el-table>
@@ -376,7 +382,7 @@
         <el-button @click="reasonCancel">取 消</el-button>
       </div>
     </el-dialog>
-</div>
+  </div>
 </template>
 
 <script>
@@ -399,7 +405,6 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {getPssrUser} from "@/api/pssr/aboveall";
 import {listTrainingbcc} from "@/api/training/trainingbcc";
-import {updateMaterialBatch} from "@/api/pssr/material";
 
 export default {
   dicts: ['pssr_approve_status'],
@@ -534,11 +539,16 @@ export default {
     getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
-    listTrainingbcc({isFinish: 1,trainingType:'14'}).then(res => {
+    listTrainingbcc({isFinish: 1, trainingType: '14'}).then(res => {
       this.trainingOptions = res.rows
     });
   },
   methods: {
+    toTrain(id) {
+      this.$router.push({
+        path: '/training/deviceList/'+id
+      })
+    },
     /** 查询开工方案列表 */
     getList() {
       this.loading = true;
@@ -590,7 +600,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.items=selection;
+      this.items = selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -705,7 +715,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-        this.reason.open=true;
+      this.reason.open = true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -758,14 +768,14 @@ export default {
     reasonCancel() {
       this.reason.open = false;
     },
-    submitReasonForm(){
+    submitReasonForm() {
       handleTurnDownProgramme(this.items).then(res => {
         this.msgSuccess("驳回成功");
         this.reason.open = false;
         this.$emit('refreshHisList');
       })
     },
-    handleBatch(){
+    handleBatch() {
       this.reset();
       this.openBatch = true
     },