Explorar el Código

PSSR环保设施

wangggziwen hace 10 meses
padre
commit
3c407c7398

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java

@@ -154,6 +154,7 @@ public class TPssrTorchvocController extends BaseController
             TPssrTorchvoc lock = new TPssrTorchvoc();
             lock.setSubId(tPssrTorchvoc.getSubId());
             lock.setApproveStatus(queryStatus);
+            lock.setTorchvocType(tPssrTorchvoc.getTorchvocType());
             for (TPssrTorchvoc item : tPssrTorchvocService.selectTPssrTorchvocList(lock)) {
                 if (item.getConfirmationDate()==null && queryStatus==3) {
                     item.setConfirmationDate(date);

+ 4 - 2
ui/src/views/pssr/torchvoc/index.vue

@@ -686,7 +686,8 @@ export default {
       let data = {
         ids: this.ids,
         subId: this.subId,
-        taskType: this.isApprove
+        taskType: this.isApprove,
+        torchvocType: this.torchvocType
       }
       handleConfirmTorchvoc(data).then(res => {
         this.msgSuccess("确认成功");
@@ -702,7 +703,8 @@ export default {
         let data = {
           ids: this.ids,
           subId: this.subId,
-          remarks: value
+          remarks: value,
+          torchvocType: this.torchvocType
         }
         handleTurnDownTorchvoc(data).then(res => {
           this.msgSuccess("驳回成功");