pssr 优化

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -373,6 +373,15 @@ public class CommonController extends BaseController
         }else if( type.equals("overhaulExchanger5") ) {
             downloadname = "PSSR检修项目-其它导入模板.xlsx";
             url = "static/template/pssr/overhaulExchanger.xlsx";
+        }else if( type.equals("overhaulExchanger6") ) {
+            downloadname = "PSSR检修项目-动设备导入模板.xlsx";
+            url = "static/template/pssr/overhaulExchanger.xlsx";
+        }else if( type.equals("overhaulExchanger7") ) {
+            downloadname = "PSSR检修项目-安全附件导入模板.xlsx";
+            url = "static/template/pssr/overhaulExchanger.xlsx";
+        }else if( type.equals("overhaulExchanger8") ) {
+            downloadname = "PSSR检修项目-管道导入模板.xlsx";
+            url = "static/template/pssr/overhaulExchanger.xlsx";
         }else if( type.equals("hygiene") ) {
             downloadname = "PSSR现场卫生导入模板.xlsx";
             url = "static/template/pssr/hygiene.xlsx";

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

@@ -297,6 +297,16 @@ public class TPssrNitrogenController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrNitrogen.setApproveStatus(0L);
+        // 氧气空 露点不空
+        if ((StringUtils.isEmpty(tPssrNitrogen.getOxygen())&&StringUtils.isEmpty(tPssrNitrogen.getoxygenValue()))&&
+                (StringUtils.isNotEmpty(tPssrNitrogen.getDewPoint())&&StringUtils.isNotEmpty(tPssrNitrogen.getDewPointValue()))){
+            tPssrNitrogen.setOxygen("NA");
+            tPssrNitrogen.setoxygenValue("NA");
+        }else if ((StringUtils.isNotEmpty(tPssrNitrogen.getOxygen())&&StringUtils.isNotEmpty(tPssrNitrogen.getoxygenValue()))&&
+                (StringUtils.isEmpty(tPssrNitrogen.getDewPoint())&&StringUtils.isEmpty(tPssrNitrogen.getDewPointValue()))){
+            tPssrNitrogen.setDewPointValue("NA");
+            tPssrNitrogen.setDewPoint("NA");
+        }
         this.verifySatndard(tPssrNitrogen);
         return toAjax(tPssrNitrogenService.insertTPssrNitrogen(tPssrNitrogen));
     }
@@ -321,23 +331,26 @@ public class TPssrNitrogenController extends BaseController {
      * @param tPssrNitrogen
      */
     private void verifySatndard(TPssrNitrogen tPssrNitrogen) {
-        String oxygen = tPssrNitrogen.getOxygen();
-        String oxygenValue = tPssrNitrogen.getoxygenValue();
-        if(StringUtils.isEmpty(oxygenValue)){
+        // 当氧气不为NA或空时，取值
+        String oxygen = (StringUtils.isEmpty(tPssrNitrogen.getOxygen())||tPssrNitrogen.getOxygen().equals("NA"))?null:tPssrNitrogen.getOxygen();
+        // 当氧气标准值不为NA或空时，取值
+        String oxygenValue = (StringUtils.isEmpty(tPssrNitrogen.getoxygenValue())||tPssrNitrogen.getoxygenValue().equals("NA"))?null:tPssrNitrogen.getoxygenValue();
+        //当氧气标准值为空并且不为NA时
+        if(StringUtils.isEmpty(oxygenValue)&&StringUtils.isNotEmpty(tPssrNitrogen.getoxygenValue())&&!tPssrNitrogen.getoxygenValue().equals("NA")){
             oxygenValue="0.2";
         }
-        String dewPoint = tPssrNitrogen.getDewPoint();
-        String dewPointValue = tPssrNitrogen.getDewPointValue();
+        String dewPoint = (StringUtils.isEmpty(tPssrNitrogen.getDewPoint())||tPssrNitrogen.getDewPoint().equals("NA"))?null:tPssrNitrogen.getDewPoint();
+        String dewPointValue = (StringUtils.isEmpty(tPssrNitrogen.getDewPointValue())||tPssrNitrogen.getDewPointValue().equals("NA"))?null:tPssrNitrogen.getDewPointValue();
         String standard = "";
         // 氧气不为空并且露点不为空并且露点标准不为空的时候
-        if (StringUtils.isNotEmpty(oxygen) && StringUtils.isNotEmpty(dewPoint) && StringUtils.isNotEmpty(dewPointValue)) {//判断氧气+露点
+        if (StringUtils.isNotEmpty(oxygen) &&StringUtils.isNotEmpty(oxygenValue) && StringUtils.isNotEmpty(dewPoint) && StringUtils.isNotEmpty(dewPointValue)) {//判断氧气+露点
             if (new BigDecimal(oxygen).compareTo(new BigDecimal(oxygenValue)) == -1
                     && new BigDecimal(dewPoint).compareTo(new BigDecimal(dewPointValue)) == -1) {
                 standard = "是";
             } else {
                 standard = "否";
             }
-        } else if (StringUtils.isNotEmpty(oxygen) && StringUtils.isEmpty(dewPoint) && StringUtils.isEmpty(dewPointValue)) {//判断氧气
+        } else if (StringUtils.isNotEmpty(oxygen) &&StringUtils.isNotEmpty(oxygenValue) && StringUtils.isEmpty(dewPoint) && StringUtils.isEmpty(dewPointValue)) {//判断氧气
             //氧气不为空 露点值为空 标准也为空
             if (new BigDecimal(oxygen).compareTo(new BigDecimal(oxygenValue)) == -1) {
                 standard = "是";
@@ -368,6 +381,19 @@ public class TPssrNitrogenController extends BaseController {
     @Log(title = "系统氮气置换", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrNitrogen tPssrNitrogen) {
+        // 氧气空 露点不空
+        if ((StringUtils.isEmpty(tPssrNitrogen.getOxygen())&&StringUtils.isEmpty(tPssrNitrogen.getoxygenValue()))&&
+                (StringUtils.isNotEmpty(tPssrNitrogen.getDewPoint())&&StringUtils.isNotEmpty(tPssrNitrogen.getDewPointValue())
+                        &&!tPssrNitrogen.getDewPoint().equals("NA")&&!tPssrNitrogen.getDewPointValue().equals("NA"))){
+            tPssrNitrogen.setOxygen("NA");
+            tPssrNitrogen.setoxygenValue("NA");
+        }else if ((StringUtils.isNotEmpty(tPssrNitrogen.getOxygen())&&StringUtils.isNotEmpty(tPssrNitrogen.getoxygenValue()))&&
+                (StringUtils.isEmpty(tPssrNitrogen.getDewPoint())&&StringUtils.isEmpty(tPssrNitrogen.getDewPointValue()))){
+            tPssrNitrogen.setDewPointValue("NA");
+            tPssrNitrogen.setDewPoint("NA");
+        }else if ((StringUtils.isNotEmpty(tPssrNitrogen.getOxygen())&&StringUtils.isEmpty(tPssrNitrogen.getoxygenValue()))){
+            tPssrNitrogen.setoxygenValue("0.2");
+        }
         TPssrNitrogen entity = tPssrNitrogenService.selectTPssrNitrogenById(tPssrNitrogen.getId());
         if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
             return AjaxResult.error("当前状态不可修改！");

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

@@ -167,6 +167,18 @@ public class TPssrOverhaulExchangerController extends BaseController {
                     filename = "PSSR_01_检修项目_其他"  + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置其他检修清单");
                     break;
+                case "6":
+                    filename = "PSSR_01_检修项目_动设备"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置动设备检修清单");
+                    break;
+                case "7":
+                    filename = "PSSR_01_检修项目_安全附件"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置安全附件检修清单");
+                    break;
+                case "8":
+                    filename = "PSSR_01_检修项目_管道"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置管道检修清单");
+                    break;
             }
 
             //填充数据

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

@@ -205,7 +205,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -181,7 +181,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -191,7 +191,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -194,7 +194,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -200,7 +200,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -209,7 +209,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -133,7 +133,7 @@
         <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
       </template>
     </el-table-column>
-      <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="序号" align="center" type="index" :index="indexMethod"  :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="检查内容" align="center" prop="checkContent" :show-overflow-tooltip="true" width="400"/>
       <el-table-column label="检查结果" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
@@ -169,7 +169,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})
@@ -203,9 +203,9 @@
     <!-- 添加或修改静电接地，跨接对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="序号">
-          <el-input v-model="form.serialNumber" placeholder="请输入序号" />
-        </el-form-item>
+<!--        <el-form-item label="序号">-->
+<!--          <el-input v-model="form.serialNumber" placeholder="请输入序号" />-->
+<!--        </el-form-item>-->
         <el-form-item label="检查内容">
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
@@ -726,6 +726,10 @@ export default {
         }
       });
     },
+    //翻页后继续计算序列值
+    indexMethod(index) {
+      return (this.queryParams.pageNum-1)*this.queryParams.pageSize+index+1;
+    }
   }
 };
 </script>

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

@@ -175,7 +175,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -195,7 +195,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -185,7 +185,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

ui/src/views/pssr/instrumentCalibration/liquidometer.vue

@@ -187,7 +187,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

ui/src/views/pssr/instrumentCalibration/regulatingValve.vue

@@ -187,7 +187,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -193,7 +193,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -138,7 +138,7 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="序号" align="center" type="index" :index="indexMethod" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="检查内容" align="center" prop="checkContent" :show-overflow-tooltip="true" width="400"/>
       <el-table-column label="检查结果" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
@@ -174,7 +174,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})
@@ -208,9 +208,9 @@
     <!-- 添加或修改照明对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="序号">
-          <el-input v-model="form.serialNumber" placeholder="请输入序号" />
-        </el-form-item>
+<!--        <el-form-item label="序号">-->
+<!--          <el-input v-model="form.serialNumber" placeholder="请输入序号" />-->
+<!--        </el-form-item>-->
         <el-form-item label="检查内容">
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
@@ -732,6 +732,10 @@ export default {
         }
       });
     },
+    //翻页后继续计算序列值
+    indexMethod(index) {
+      return (this.queryParams.pageNum-1)*this.queryParams.pageSize+index+1;
+    }
   }
 };
 </script>

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

@@ -199,7 +199,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -17,7 +17,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -40,18 +40,6 @@
         >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="multiple"
-          @click="handleBatch"
-          v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
-        >批量修改
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -64,17 +52,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:material:edit']"
-          v-if="isApprove==0"
-        >导入
-        </el-button>
-      </el-col>-->
+      <!--       <el-col :span="1.5">
+         <el-button
+           type="info"
+           icon="el-icon-upload2"
+           size="mini"
+           @click="handleImport"
+           v-hasPermi="['pssr:material:edit']"
+           v-if="isApprove==0"
+         >导入
+         </el-button>
+       </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -95,7 +83,8 @@
           @click="handleBatch"
           v-if="isApprove==0"
           v-hasPermi="['pssr:material:edit']"
-        >批量操作</el-button>
+        >批量操作
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -177,15 +166,15 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件({{scope.row.fileNum}})
+          >附件({{ scope.row.fileNum }})
           </el-button>
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
-         >附件(管)({{scope.row.fileNum}})
+          >附件(管)({{ scope.row.fileNum }})
           </el-button>
           <el-button
             size="mini"
@@ -218,8 +207,20 @@
     <!-- 添加或修改原料对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入Quantity"/>
+        <el-form-item label="公用工程物料" prop="utilityQuantity">
+          <el-input v-model="form.utilityQuantity" placeholder="请输入公用工程物料"/>
+        </el-form-item>
+        <el-form-item label="条件/存量">
+          <el-radio-group v-model="form.statusType" @input="changeQuantity">
+            <el-radio :label="1">具备投用状态</el-radio>
+            <el-radio :label="0">具体投用数量</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="具体投用数量" v-if="qFlag">
+          <el-input v-model="form.quantity" placeholder="请输入具体投用数量"/>
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位"/>
         </el-form-item>
         <el-form-item label="确认人" prop="confirm1">
           <el-select v-model="form.confirm1" filterable placeholder="请选择确认人">
@@ -240,7 +241,7 @@
     </el-dialog>
     <!-- 批量修改对话框 -->
     <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
-      <el-form ref="form" :model="form"  label-width="80px">
+      <el-form ref="form" :model="form" label-width="80px">
         <el-form-item>
           <span>已选择 {{ ids.length }} 条数据</span>
         </el-form-item>
@@ -253,7 +254,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -301,15 +302,15 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </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 :data="items" border>
         <el-table-column label="公用工程物料" align="center" prop="utilityQuantity"
                          :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>
@@ -318,7 +319,7 @@
         <el-button @click="reasonCancel">取 消</el-button>
       </div>
     </el-dialog>
-</div>
+  </div>
 </template>
 
 <script>
@@ -359,6 +360,7 @@ export default {
   },
   data() {
     return {
+      qFlag: false,
       reason: {
         open: false
       },
@@ -441,7 +443,8 @@ export default {
         ],
         confirm2: [
           {required: true, message: "确认人2不能为空", trigger: "blur"}
-        ],}
+        ],
+      }
     };
   },
   watch: {
@@ -462,6 +465,15 @@ export default {
     });
   },
   methods: {
+    changeQuantity(label){
+      console.log(label)
+      if (label==1) {
+        this.qFlag=false;
+      }else{
+        this.form.quantity='';
+        this.qFlag=true;
+      }
+    },
     /** 查询原料列表 */
     getList() {
       this.loading = true;
@@ -516,7 +528,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
@@ -535,10 +547,19 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改原料";
+
+        if (this.form.quantity == '具备投用状态') {
+          this.form.statusType = 1;
+        } else {
+          this.form.statusType = 0;
+        }
       });
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.form.statusType == 1) {
+        this.form.quantity = '具备投用状态'
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -662,7 +683,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-        this.reason.open=true;
+      this.reason.open = true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -675,14 +696,14 @@ export default {
     reasonCancel() {
       this.reason.open = false;
     },
-    submitReasonForm(){
+    submitReasonForm() {
       handleTurnDownMaterial(this.items).then(res => {
         this.msgSuccess("驳回成功");
         this.reason.open = false;
         this.$emit('refreshHisList');
       })
     },
-    handleBatch(){
+    handleBatch() {
       this.reset();
       this.openBatch = true
     },

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

@@ -17,7 +17,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+     <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -40,18 +40,6 @@
         >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="multiple"
-          @click="handleBatch"
-          v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
-        >批量修改
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -64,7 +52,7 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="info"
           icon="el-icon-upload2"
@@ -160,7 +148,7 @@
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>w
       <el-table-column label="确认时间" align="center" prop="confirmationDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
@@ -182,7 +170,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})
@@ -218,8 +206,20 @@
     <!-- 添加或修改原料对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入Quantity"/>
+        <el-form-item label="公用工程物料" prop="utilityQuantity">
+          <el-input v-model="form.utilityQuantity" placeholder="请输入公用工程物料"/>
+        </el-form-item>
+        <el-form-item label="条件/存量">
+          <el-radio-group v-model="form.statusType" @input="changeQuantity">
+            <el-radio :label="1">具备投用状态</el-radio>
+            <el-radio :label="0">具体投用数量</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="具体投用数量" v-if="qFlag">
+          <el-input v-model="form.quantity" placeholder="请输入具体投用数量"/>
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位"/>
         </el-form-item>
         <el-form-item label="确认人" prop="confirm1">
           <el-select v-model="form.confirm1" filterable placeholder="请选择确认人">
@@ -358,6 +358,7 @@ export default {
   },
   data() {
     return {
+      qFlag: false,
       reason: {
         open: false
       },
@@ -462,6 +463,15 @@ export default {
     });
   },
   methods: {
+    changeQuantity(label){
+      console.log(label)
+      if (label==1) {
+        this.qFlag=false;
+      }else{
+        this.form.quantity='';
+        this.qFlag=true;
+      }
+    },
     /** 查询原料列表 */
     getList() {
       this.loading = true;

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

@@ -187,7 +187,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -204,7 +204,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -182,7 +182,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -187,7 +187,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -190,7 +190,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})
@@ -646,6 +646,15 @@ export default {
       case 5:
         this.upload.type = 'overhaulExchanger5';
         break;
+      case 6:
+        this.upload.type = 'overhaulExchanger6';
+        break;
+      case 7:
+        this.upload.type = 'overhaulExchanger7';
+        break;
+      case 8:
+        this.upload.type = 'overhaulExchanger8';
+        break;
     }
   },
   methods: {

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

@@ -191,7 +191,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -190,7 +190,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -175,7 +175,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -226,7 +226,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -169,7 +169,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -174,7 +174,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -186,7 +186,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -187,7 +187,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -150,8 +150,8 @@
       </el-table-column>
       <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="设备位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="润滑部位" align="center" prop="lubricatingPart" :show-overflow-tooltip="true"
-                       width="180"/>
+<!--      <el-table-column label="润滑部位" align="center" prop="lubricatingPart" :show-overflow-tooltip="true"-->
+<!--                       width="180"/>-->
       <el-table-column label="检查内容" align="center">
       <el-table-column label="润滑油或油脂加注完成(是/否)" align="center" prop="fillingComplete"
                        :show-overflow-tooltip="true" width="230"/>
@@ -191,7 +191,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -187,7 +187,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -169,9 +169,9 @@
       <el-table-column label="安装位置准确(是/否)" align="center" prop="installAccuracy" :show-overflow-tooltip="true"
                        width="180"/>
       <el-table-column label="投用(是/否)" align="center" prop="putUse" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="设定压力(kpa)" align="center" prop="setPressure" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="校验压力与设定压力一致(是/否)" align="center" prop="uniformPressure"
-                       :show-overflow-tooltip="true" width="230"/>
+<!--      <el-table-column label="设定压力(kpa)" align="center" prop="setPressure" :show-overflow-tooltip="true" width="180"/>-->
+<!--      <el-table-column label="校验压力与设定压力一致(是/否)" align="center" prop="uniformPressure"-->
+<!--                       :show-overflow-tooltip="true" width="230"/>-->
       <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
@@ -203,7 +203,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -203,7 +203,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -156,7 +156,7 @@
       </el-table-column>
       <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="120"/>
-      <el-table-column label="保护设备" align="center" prop="safetyDev" :show-overflow-tooltip="true" width="120"/>
+<!--      <el-table-column label="保护设备" align="center" prop="safetyDev" :show-overflow-tooltip="true" width="120"/>-->
       <el-table-column label="安装位置描述" align="center" prop="installLocation" :show-overflow-tooltip="true"
                        width="120"/>
       <el-table-column label="检查内容" align="center">
@@ -203,7 +203,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -197,7 +197,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -154,7 +154,7 @@
       <u-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
       <u-table-column label="P&ID图号" align="center" prop="pidNo" :show-overflow-tooltip="true" width="180"/>
       <u-table-column label="安全阀位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
-      <u-table-column label="保护设备" align="center" prop="safetyDev" :show-overflow-tooltip="true" width="180"/>
+<!--      <u-table-column label="保护设备" align="center" prop="safetyDev" :show-overflow-tooltip="true" width="180"/>-->
       <u-table-column label="已经校验(是/否)" align="center" prop="verify" :show-overflow-tooltip="true" width="180"/>
       <u-table-column label="在有效期内(是/否)" align="center" prop="inValidity" :show-overflow-tooltip="true" width="180"/>
       <u-table-column label="安装位置" align="center" prop="installLocation" :show-overflow-tooltip="true"
@@ -195,7 +195,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})

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

@@ -26,6 +26,15 @@
         <el-tab-pane label="其他" name="eighth">
           <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="其他" :dev-type="Number(5)"/>
         </el-tab-pane>
+        <el-tab-pane label="动设备" name="ninth">
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="动设备" :dev-type="Number(6)"/>
+        </el-tab-pane>
+        <el-tab-pane label="安全附件" name="tenth">
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="安全附件" :dev-type="Number(7)"/>
+        </el-tab-pane>
+        <el-tab-pane label="管道" name="eleven">
+          <overhaul-exchanger :sub-id="Number(si)" :is-approve="Number(isApprove)" dev-name="管道" :dev-type="Number(8)"/>
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-if="sn=='kgfa'">

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

@@ -147,7 +147,7 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="序号" align="center" type="index" :index="indexMethod" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="投用步骤内容" align="center" prop="content" :show-overflow-tooltip="true" width="400"/>
       <el-table-column label="步骤状态" align="center" prop="procedureStatus" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
@@ -182,7 +182,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})
@@ -216,9 +216,9 @@
     <!-- 添加或修改火炬，VOC系统对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="序号">
-          <el-input v-model="form.serialNumber" placeholder="请输入序号" />
-        </el-form-item>
+<!--        <el-form-item label="序号">-->
+<!--          <el-input v-model="form.serialNumber" placeholder="请输入序号" />-->
+<!--        </el-form-item>-->
         <el-form-item label="投用步骤内容">
           <el-input v-model="form.content" placeholder="请输入投用步骤内容" />
         </el-form-item>
@@ -736,6 +736,10 @@ export default {
         }
       });
     },
+    //翻页后继续计算序列值
+    indexMethod(index) {
+      return (this.queryParams.pageNum-1)*this.queryParams.pageSize+index+1;
+    }
   }
 };
 </script>

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

@@ -225,7 +225,7 @@
           <el-button
             size="mini"
             type="text"
-            v-hasPermi="['pssr:file:specialEdit']"
+            v-hasPermi="['pssr:date:edit']"
             icon="el-icon-folder"
             @click="handleDocSpecial(scope.row)"
          >附件(管)({{scope.row.fileNum}})