pssr

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

@@ -97,18 +97,13 @@ public class TPssrLockController extends BaseController {
         long approveStatus = 0;
         Date date = null;
         if (tPssrLock.getTaskType() == 4) {
-            //拆锁确认
+            //上锁确认
             queryStatus = 1;
             approveStatus = 3;
             date = new Date();
         } else if (tPssrLock.getTaskType() == 5) {
-            //上锁确认
-            queryStatus = 3;
-            approveStatus = 4;
-            date = new Date();
-        } else if (tPssrLock.getTaskType() == 6) {
             //确认人确认
-            queryStatus = 4;
+            queryStatus = 3;
             approveStatus = 2;
             date = new Date();
         }
@@ -117,11 +112,7 @@ public class TPssrLockController extends BaseController {
             for (Long id : tPssrLock.getIds()) {
                 TPssrLock item = tPssrLockService.selectTPssrLockById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getUnlockDate()==null) {
-                    item.setUnlockDate(date);
-                } else if (item.getLockedDate()==null) {
-                    item.setLockedDate(date);
-                } else if (item.getConfirmationDate()==null) {
+                if (item.getConfirmationDate() == null && approveStatus == 2) {
                     item.setConfirmationDate(date);
                 }
                 tPssrLockService.updateTPssrLock(item);
@@ -131,11 +122,7 @@ public class TPssrLockController extends BaseController {
             lock.setSubId(tPssrLock.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrLock item : tPssrLockService.selectTPssrLockList(lock)) {
-                if (item.getUnlockDate()==null) {
-                    item.setUnlockDate(date);
-                } else if (item.getLockedDate()==null) {
-                    item.setLockedDate(date);
-                } else if (item.getConfirmationDate()==null) {
+                if (item.getConfirmationDate() == null && approveStatus == 2) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -148,14 +135,10 @@ public class TPssrLockController extends BaseController {
         entity.setApproveStatus(queryStatus);
         for (TPssrLock item : tPssrLockService.selectTPssrLockList(entity)) {
             if (tPssrLock.getTaskType() == 4) {
-                if (item.getUnlocker().equals(getUserId().toString())) {
-                    return AjaxResult.success();
-                }
-            } else if (tPssrLock.getTaskType() == 5) {
                 if (item.getLockeder().equals(getUserId().toString())) {
                     return AjaxResult.success();
                 }
-            } else if (tPssrLock.getTaskType() == 6) {
+            } else if (tPssrLock.getTaskType() == 5) {
                 if (item.getConfirm().equals(getUserId().toString())) {
                     return AjaxResult.success();
                 }

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

@@ -94,7 +94,7 @@
             </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
@@ -105,7 +105,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==4||isApprove==5||isApprove==6"
@@ -140,26 +139,6 @@
       <el-table-column label="位置" align="center" prop="position" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="尺寸" align="center" prop="lockSize" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="PID标注状态" align="center" prop="pidStatus" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="拆锁人" align="center" prop="unlocker" :show-overflow-tooltip="true" width="150">
-        <template slot-scope="scope">
-          <span>{{ userFormat(scope.row.unlocker) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="拆锁时间" align="center" prop="unlockDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.unlockDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="上锁人" align="center" prop="lockeder" :show-overflow-tooltip="true" width="150">
-        <template slot-scope="scope">
-          <span>{{ userFormat(scope.row.lockeder) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="上锁时间" align="center" prop="lockedDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.lockedDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="上锁位置正确(是/否)" align="center" prop="positionRight" :show-overflow-tooltip="true"
                        width="150"/>
       <el-table-column label="阀门状态正确(是/否)" align="center" prop="statusRight" :show-overflow-tooltip="true"
@@ -168,7 +147,12 @@
                        width="150"/>
       <el-table-column label="锁体和链条无损坏(是/否)" align="center" prop="noDamage" :show-overflow-tooltip="true"
                        width="170"/>
-      <el-table-column label="确认人" align="center" prop="confirm" :show-overflow-tooltip="true" width="150">
+      <el-table-column label="确认人1" align="center" prop="lockeder" :show-overflow-tooltip="true" width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.lockeder) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirm" :show-overflow-tooltip="true" width="150">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm) }}</span>
         </template>

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

@@ -111,7 +111,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
@@ -122,7 +122,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"

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

@@ -94,7 +94,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
@@ -105,7 +105,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"

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

@@ -85,7 +85,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           v-if="isApprove==0"
@@ -96,7 +96,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"

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

@@ -94,7 +94,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
@@ -105,7 +105,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"

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

@@ -95,7 +95,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
@@ -106,7 +106,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"

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

@@ -92,7 +92,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
@@ -103,7 +103,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"

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

@@ -130,7 +130,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="success"
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleApprove"
@@ -141,7 +141,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
           icon="el-icon-check"
           size="mini"
           v-if="isApprove==1"

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

@@ -56,7 +56,7 @@
     <div v-if="sn=='xcws'">
       <hygiene :sub-id="Number(si)" :is-approve="Number(isApprove)"  @refreshHisList="refreshHisList"/>
     </div>
-    <div v-if="sn=='sbqj'">
+    <div v-if="sn=='sbqjd'">
       <cleaning :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='dj'">