PSSR驳回功能更新

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

@@ -103,20 +103,20 @@ public class TPssrAboveallController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrAboveall tPssrAboveall) {
         tPssrAboveallService.insertTPssrAboveall(tPssrAboveall);//新增主表数据
-        //新增子表数据
-        for (TPssrSubcontent subcontent : tPssrAboveall.getSubcontents()) {
-            if (subcontent.getStatus() == 1) {
-                subcontent.setAboveallId(tPssrAboveall.getId());//主表id
-                subcontent.setRegion(tPssrAboveall.getRegion());
-                subcontent.setUnit(tPssrAboveall.getUnit());
-                subcontent.setUnitDes(tPssrAboveall.getUnitDes());
-                subcontent.setApproveStatus(0L);
-                subcontent.setCreatedate(new Date());
-                subcontent.setCreaterCode(getUserId().toString());
-                tPssrSubcontentService.insertTPssrSubcontent(subcontent);
 
-                String userId = getUserId().toString();
-                new Thread(() -> {
+        String userId = getUserId().toString();
+        //新增子表数据
+        new Thread(() -> {
+            for (TPssrSubcontent subcontent : tPssrAboveall.getSubcontents()) {
+                if (subcontent.getStatus() == 1) {
+                    subcontent.setAboveallId(tPssrAboveall.getId());//主表id
+                    subcontent.setRegion(tPssrAboveall.getRegion());
+                    subcontent.setUnit(tPssrAboveall.getUnit());
+                    subcontent.setUnitDes(tPssrAboveall.getUnitDes());
+                    subcontent.setApproveStatus(0L);
+                    subcontent.setCreatedate(new Date());
+                    subcontent.setCreaterCode(userId);
+                    tPssrSubcontentService.insertTPssrSubcontent(subcontent);
                     if (subcontent.getForShort().equals("xqf")) {
 
                         List<TPssrPatrol> tPssrPatrols = new ArrayList<>();
@@ -182,9 +182,9 @@ public class TPssrAboveallController extends BaseController {
                     } else if (subcontent.getForShort().equals("lsdy")) {
                         genLsdy(subcontent.getId(), userId);
                     }
-                }, "新增子表数据").start();
+                }
             }
-        }
+        }, "新增子表数据").start();
         return AjaxResult.success();
     }
 
@@ -200,15 +200,15 @@ public class TPssrAboveallController extends BaseController {
      * 生成照明、电伴热数据
      */
     private void genZmdbr(Long subId, String userId) {
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯外观完好，干净，无破损。", "1",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯无锈蚀。", "1",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯具固定牢固，无松动。", "1",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明导线完好，无破损。", "1",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明开关完好。", "1",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明设备可以正常打开或者关闭。", "1",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "现场电伴热带无破损断裂，无变形", "2",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "电伴热带与管道设备紧密贴合，无缝隙", "2",userId, new Date()));
-        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "电源接线盒牢固密封，接线端子无松动锈蚀。", "2",userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯外观完好，干净，无破损。", "1", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯无锈蚀。", "1", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明灯具固定牢固，无松动。", "1", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明导线完好，无破损。", "1", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明开关完好。", "1", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "照明设备可以正常打开或者关闭。", "1", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "现场电伴热带无破损断裂，无变形", "2", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "电伴热带与管道设备紧密贴合，无缝隙", "2", userId, new Date()));
+        tPssrLightingService.insertTPssrLighting(new TPssrLighting(subId, "电源接线盒牢固密封，接线端子无松动锈蚀。", "2", userId, new Date()));
     }
 
     /**

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

@@ -359,9 +359,7 @@
       <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>
@@ -378,7 +376,7 @@
         <el-button @click="reasonCancel">取 消</el-button>
       </div>
     </el-dialog>
-  </div>
+</div>
 </template>
 
 <script>

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

@@ -55,75 +55,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--<el-form-item label="CTA/SP检查人" prop="spChecker">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.spChecker"-->
-          <!--placeholder="请输入CTA/SP检查人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="工艺检查人" prop="processValidator">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.processValidator"-->
-          <!--placeholder="请输入工艺检查人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="确认时间" prop="confirmationDate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.confirmationDate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择确认时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="创建人" prop="createrCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.createrCode"-->
-          <!--placeholder="请输入创建人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="创建时间" prop="createdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.createdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择创建时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改人" prop="updaterCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.updaterCode"-->
-          <!--placeholder="请输入修改人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改时间" prop="updatedate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.updatedate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择修改时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="部门编号" prop="deptId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.deptId"-->
-          <!--placeholder="请输入部门编号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
       <el-form-item label="确认人1" prop="confirm1">
         <el-input
           v-model="queryParams.confirm1"
@@ -312,6 +243,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -366,10 +298,16 @@
           <el-input v-model="form.devNo" placeholder="请输入在线分析仪位号" />
         </el-form-item>
         <el-form-item label="外观检查" prop="visualInspection">
-          <el-input v-model="form.visualInspection" placeholder="请输入外观检查" />
+          <el-radio-group v-model="form.visualInspection">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="功能检查" prop="functionalCheck">
-          <el-input v-model="form.functionalCheck" placeholder="请输入功能检查" />
+          <el-radio-group v-model="form.functionalCheck">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <!--<el-form-item label="CTA/SP检查人" prop="spChecker">-->
           <!--<el-input v-model="form.spChecker" placeholder="请输入CTA/SP检查人" />-->
@@ -479,7 +417,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="unit" :show-overflow-tooltip="true"/>
+        <el-table-column label="在线分析仪位号" align="center" prop="devNo" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -518,6 +473,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -534,6 +492,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -668,6 +627,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -782,24 +742,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownAnalyzer(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -823,6 +766,17 @@ export default {
         });
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownAnalyzer(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -173,6 +173,7 @@
           <span>{{ parseTime(scope.row.installDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
                        class-name="small-padding fixed-width">
@@ -393,7 +394,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="blindNo" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -432,6 +449,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -449,6 +469,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -555,24 +576,7 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownBlind(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -688,6 +692,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -801,6 +806,17 @@ export default {
         });
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownBlind(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -341,6 +341,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -523,7 +524,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="unit" :show-overflow-tooltip="true"/>
+        <el-table-column label="系统名称" align="center" prop="systemName" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -561,6 +579,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -577,6 +598,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -727,6 +749,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -839,24 +862,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownCircuit(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -865,6 +871,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownCircuit(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -294,6 +294,7 @@
       <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width"
                        v-if="isApprove==0">
@@ -351,7 +352,10 @@
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果"/>
+          <el-radio-group v-model="form.checkResult">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
@@ -460,7 +464,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="unit" :show-overflow-tooltip="true" width="100"/>
+        <el-table-column label="检查内容" align="center" prop="checkContent" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -499,6 +520,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -515,6 +539,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -655,6 +680,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -767,24 +793,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownCleaning(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -793,6 +802,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownCleaning(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -364,6 +364,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width"
                        v-if="isApprove==0">
@@ -593,7 +594,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="pipelineNumber" :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="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -632,6 +650,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -648,6 +669,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -792,6 +814,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -921,24 +944,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownFrame(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -1048,6 +1054,17 @@ export default {
         )
       ]
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownFrame(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -291,6 +291,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -342,7 +343,10 @@
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果" />
+          <el-radio-group v-model="form.checkResult">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <!--<el-form-item label="检查结果异常说明" prop="checkDes">-->
           <!--<el-input v-model="form.checkDes" placeholder="请输入检查结果异常说明" />-->
@@ -455,7 +459,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="checkContent" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -495,6 +515,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -511,6 +534,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -643,6 +667,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -772,24 +797,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownFranklinism(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -798,6 +806,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownFranklinism(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -306,6 +306,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -473,7 +474,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="devNo" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -512,6 +529,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -528,6 +548,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -662,6 +683,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -791,24 +813,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownGasdetector(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -817,6 +822,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownGasdetector(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -263,6 +263,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -305,7 +306,10 @@
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果" />
+          <el-radio-group v-model="form.checkResult">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
@@ -418,7 +422,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="checkContent" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -457,6 +477,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -473,6 +496,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -607,6 +631,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -719,24 +744,7 @@ export default {
         })
       },
       handleTurnDown(val) {
-        this.$prompt('请输入驳回原因', '提示', {
-          confirmButtonText: '确认驳回',
-          cancelButtonText: '取消',
-        }).then(({value}) => {
-          let data = {
-            ids: this.ids,
-            subId: this.subId,
-            remarks: value
-          }
-          handleTurnDownHygiene(data).then(res => {
-            this.msgSuccess("驳回成功");
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '取消驳回'
-          });
-        });
+        this.reason.open=true;
       },
       userFormat(userId) {
         for (let item of this.userOptions) {
@@ -745,6 +753,17 @@ export default {
           }
         }
       },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownHygiene(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -316,6 +316,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
 <!--      <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -486,7 +487,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="unit" :show-overflow-tooltip="true"/>
+        <el-table-column label="流量计位号" align="center" prop="devNo" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -525,6 +543,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -541,6 +562,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -677,6 +699,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -792,24 +815,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownInstrumentCalibration(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -833,6 +839,17 @@ export default {
         });
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownInstrumentCalibration(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -300,6 +300,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <!--<el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true"/>-->
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
@@ -458,7 +459,25 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </div>
       </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="instrumentNumber" :show-overflow-tooltip="true"/>
+        <el-table-column label="名称" align="center" prop="name" :show-overflow-tooltip="true"/>
+        <el-table-column label="出厂序列号" align="center" prop="serialNumber" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -501,6 +520,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -644,6 +664,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -756,24 +777,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownLaboratory(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -782,6 +786,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownLaboratory(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -296,6 +296,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -347,7 +348,10 @@
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果" />
+          <el-radio-group v-model="form.checkResult">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <!--<el-form-item label="检查结果异常说明" prop="checkDes">-->
           <!--<el-input v-model="form.checkDes" placeholder="请输入检查结果异常说明" />-->
@@ -460,7 +464,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="checkContent" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -504,6 +524,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -520,6 +543,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -654,6 +678,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -768,25 +793,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value,
-          lightingType: this.lightingType,
-        }
-        handleTurnDownLighting(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -810,6 +817,17 @@ export default {
         });
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownLighting(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -177,6 +177,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="操作" align="center" fixed="right" width="120"
                        class-name="small-padding fixed-width">
@@ -338,7 +339,23 @@
                append-to-body>
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="lockCode" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -378,6 +395,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -396,6 +416,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -521,24 +542,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownLock(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -615,6 +619,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -737,6 +742,17 @@ export default {
         });
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownLock(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -181,6 +181,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -317,7 +318,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="Utility consumption quantity" 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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -357,6 +375,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -373,6 +394,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -509,6 +531,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -660,24 +683,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownMaterial(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -686,6 +692,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownMaterial(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -181,6 +181,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -343,7 +344,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="Raw material" align="center" prop="rawMaterial"
+                         :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -384,6 +402,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -400,6 +421,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -537,6 +559,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -688,24 +711,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownMaterialRaw(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -714,6 +720,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownMaterialRaw(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -159,6 +159,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"  width="150"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -212,13 +213,22 @@
           <el-input v-model="form.proMeasure" placeholder="请输入防护措施"/>
         </el-form-item>
         <el-form-item label="防护装置无缺失" prop="noDamage">
-          <el-input v-model="form.noDamage" placeholder="请输入防护装置无缺失"/>
+          <el-radio-group v-model="form.noDamage">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="防护装置被固定，无松动" prop="locked">
-          <el-input v-model="form.locked" placeholder="请输入防护装置被固定，无松动"/>
+          <el-radio-group v-model="form.locked">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="防护装置无腐蚀破损" prop="noWorn">
-          <el-input v-model="form.noWorn" placeholder="请输入防护装置无腐蚀破损"/>
+          <el-radio-group v-model="form.noWorn">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" filterable placeholder="请选择确认人1">
@@ -293,7 +303,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="devNo" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="设备名称" align="center" prop="devName" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -331,6 +358,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -347,6 +377,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -495,6 +526,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -622,24 +654,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownMeasure(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -648,6 +663,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownMeasure(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -181,6 +181,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" v-if="isApprove==0" width="120"
                        class-name="small-padding fixed-width">
@@ -316,7 +317,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="MOC编号" align="center" prop="mocNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="标题" align="center" prop="title" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -355,6 +373,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -371,6 +392,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -515,6 +537,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -666,24 +689,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownMoc(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -692,6 +698,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownMoc(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -305,6 +305,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -472,7 +473,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="devNo" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -511,6 +528,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -527,6 +547,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -661,6 +682,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -775,24 +797,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownMotor(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -816,6 +821,17 @@ export default {
         });
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownMotor(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -154,6 +154,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
                        class-name="small-padding fixed-width">
@@ -290,7 +291,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="systemName" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -329,6 +346,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -345,6 +365,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -489,6 +510,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -616,24 +638,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownNitrogen(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -642,6 +647,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownNitrogen(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -176,6 +176,7 @@
         </template>
       </el-table-column>
       <el-table-column label="确认人" align="center" prop="confirmedName" :show-overflow-tooltip="true"/>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center"
                        v-if="isApprove==0" class-name="small-padding fixed-width">
@@ -371,7 +372,24 @@
                width="1000px">
       <el-image v-for="file in doc_p.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="tagNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备名称" align="center" prop="equipmentName" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -421,6 +439,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc_p: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -477,6 +498,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -587,25 +609,7 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownExchanger(data).then(res => {
-          this.msgSuccess("驳回成功");
-          this.getList();
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     getTagType(val) {
       if (val == 0) {
@@ -684,6 +688,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -865,6 +870,17 @@ export default {
         this.msgSuccess(this.$t('删除成功'));
       })
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownExchanger(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -161,6 +161,7 @@
         </template>
       </el-table-column>
       <el-table-column label="负责人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center"
                        v-if="isApprove==0" class-name="small-padding fixed-width">
@@ -377,7 +378,25 @@
                width="1000px">
       <el-image v-for="file in doc_p.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="strainerLocation" :show-overflow-tooltip="true"/>
+        <el-table-column label="P&ID号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="管线号" align="center" prop="isoDwgNo" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -420,6 +439,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc_p: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -476,6 +498,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -590,24 +613,7 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownFilter(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     getTagType(val){
       if (val==0){
@@ -688,6 +694,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -870,6 +877,17 @@ export default {
         this.msgSuccess(this.$t('删除成功'));
       })
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownFilter(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -140,6 +140,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" v-if="isApprove==0" fixed="right"
                        class-name="small-padding fixed-width">

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

@@ -149,6 +149,7 @@
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0"
                        class-name="small-padding fixed-width">

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

@@ -160,6 +160,7 @@
         </template>
       </el-table-column>
       <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
@@ -354,7 +355,24 @@
                width="1000px">
       <el-image v-for="file in doc_p.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="tagNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备名称" align="center" prop="equipmentName" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -397,6 +415,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc_p: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -453,6 +474,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -545,24 +567,7 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownTower(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     getTagType(val){
       if (val==0){
@@ -640,6 +645,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -822,6 +828,17 @@ export default {
         this.msgSuccess(this.$t('删除成功'));
       })
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownTower(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -163,6 +163,7 @@
       </el-table-column>
       <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"
                        width="180"/>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
@@ -373,7 +374,23 @@
                width="1000px">
       <el-image v-for="file in doc_p.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="item" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -415,6 +432,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc_p: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -471,6 +491,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -574,24 +595,7 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownValve(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     getTagType(val){
       if (val==0){
@@ -680,6 +684,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -862,6 +867,17 @@ export default {
         this.msgSuccess(this.$t('删除成功'));
       })
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownValve(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -187,6 +187,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -365,7 +366,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="pipelineName" :show-overflow-tooltip="true"/>
+        <el-table-column label="管道编号" align="center" prop="pipelineNo" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -406,6 +424,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -422,6 +443,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -558,6 +580,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -718,24 +741,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownPipe(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -744,6 +750,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownPipe(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -268,6 +268,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <!--<el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true"/>-->
       <!--<el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"/>-->
@@ -322,7 +323,10 @@
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果" />
+          <el-radio-group v-model="form.checkResult">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="确认时间" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -437,7 +441,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="checkContent" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -476,6 +496,9 @@ export default {
   // components: { Editor },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -492,6 +515,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -624,6 +648,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -739,24 +764,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownPower(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -765,6 +773,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownPower(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -140,6 +140,7 @@
           <span>{{ userFormat(scope.row.confirm2) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" v-if="isApprove==0" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -300,7 +301,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -339,6 +356,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -374,6 +394,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -507,6 +528,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -621,24 +643,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownProgramme(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -686,6 +691,17 @@ export default {
       this.pdf.title = row.fileName
       this.pdf.pdfUrl = process.env.VUE_APP_BASE_API + '/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownProgramme(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -138,6 +138,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -185,7 +186,10 @@
           <el-input v-model="form.checkContent" placeholder="请输入检查内容"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果"/>
+          <el-radio-group v-model="form.checkResult">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" filterable placeholder="请选择确认人1">
@@ -253,7 +257,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="checkContent" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -293,6 +313,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -309,6 +332,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -447,6 +471,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -574,24 +599,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownProtection(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -600,6 +608,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownProtection(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -193,12 +193,6 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 附件对话框 -->
-    <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="doc.open" append-to-body title="现场照片"
-               width="1000px">
-      <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
-    </el-dialog>
   </div>
 </template>
 

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

@@ -271,6 +271,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -313,7 +314,10 @@
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果" />
+          <el-radio-group v-model="form.checkResult">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
         </el-form-item>
         <!--<el-form-item label="确认人" prop="confirm">-->
           <!--<el-input v-model="form.confirm" placeholder="请输入确认人" />-->
@@ -414,13 +418,23 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </div>
       </el-dialog>
-
-    <!-- 附件对话框 -->
-    <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="doc.open" append-to-body title="现场照片"
+  <!-- 驳回原因对话框 -->
+    <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="reason.open" append-to-body title="驳回"
                width="1000px">
-      <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
+      <el-table  :data="items" border>
+        <el-table-column label="检查内容" align="center" prop="checkContent" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
     </el-dialog>
-  </div>
+</div>
 </template>
 
 <script>
@@ -459,11 +473,15 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       userOptions: [],
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -592,6 +610,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -706,24 +725,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownPublic(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -732,6 +734,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownPublic(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -159,6 +159,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -283,7 +284,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="position" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -322,6 +339,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -338,6 +358,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -480,6 +501,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -628,24 +650,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownPumpCleaning(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -654,6 +659,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownPumpCleaning(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -163,6 +163,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -287,7 +288,23 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="devNo" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -326,6 +343,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -342,6 +362,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -484,6 +505,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -632,24 +654,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownPumpFill(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -658,6 +663,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownPumpFill(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -159,6 +159,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -277,7 +278,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="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="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -316,6 +334,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -332,6 +353,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -470,6 +492,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -618,24 +641,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownPumpOverhaul(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -644,6 +650,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownPumpOverhaul(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -107,6 +107,7 @@
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="负责人" align="center" prop="chargePerson" :show-overflow-tooltip="true"
                        :formatter="userFormatter"/>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">

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

@@ -175,6 +175,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="140"
                        class-name="small-padding fixed-width">
@@ -314,7 +315,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="P&ID图号" align="center" prop="pidNo" :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="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -352,6 +370,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -368,6 +389,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -520,6 +542,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -648,24 +671,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownBleed(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -674,6 +680,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownBleed(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -175,6 +175,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
                        class-name="small-padding fixed-width">
@@ -314,7 +315,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="P&ID图号" align="center" prop="pidNo" :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="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -352,6 +370,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -368,6 +389,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -513,6 +535,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -641,24 +664,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownBreath(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -667,6 +673,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownBreath(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -175,6 +175,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
@@ -332,7 +333,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="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="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -370,6 +388,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -386,6 +407,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -531,6 +553,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -658,24 +681,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownBrust(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -684,6 +690,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownBrust(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -169,6 +169,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
@@ -308,7 +309,25 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="devNo" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="安装位置描述" align="center" prop="installLocation" :show-overflow-tooltip="true"
+                         width="180"/>
+        <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -346,6 +365,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -362,6 +384,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -499,6 +522,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -626,24 +650,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleturnDownFlamearrester(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -652,6 +659,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleturnDownFlamearrester(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -175,6 +175,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
@@ -314,7 +315,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="P&ID图号" align="center" prop="pidNo" :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="reason" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-input v-model="scope.row.reason" placeholder="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -352,6 +370,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -368,6 +389,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -511,6 +533,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -640,24 +663,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleturnDownValve(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -666,6 +672,17 @@ export default {
         }
       }
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleturnDownValve(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -272,6 +272,7 @@
         <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
         <template slot-scope="scope">
@@ -432,7 +433,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="content" :show-overflow-tooltip="true"/>
+        <el-table-column label="步骤状态" align="center" prop="procedureStatus" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -476,6 +494,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -492,6 +513,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -622,6 +644,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -736,25 +759,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value,
-          torchvocType: this.torchvocType
-        }
-        handleTurnDownTorchvoc(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -778,6 +783,17 @@ export default {
         });
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownTorchvoc(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>

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

@@ -191,6 +191,7 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -375,7 +376,24 @@
                width="1000px">
       <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
     </el-dialog>
-  </div>
+  <!-- 驳回原因对话框 -->
+    <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="vesselName" :show-overflow-tooltip="true"/>
+        <el-table-column label="容器编号" align="center" prop="vesselNo" :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="请输入驳回原因"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReasonForm">确 定</el-button>
+        <el-button @click="reasonCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+</div>
 </template>
 
 <script>
@@ -415,6 +433,9 @@ export default {
   },
   data() {
     return {
+      reason: {
+        open: false
+      },
       doc: {
         file: "",
         // 是否显示弹出层（报告附件）
@@ -432,6 +453,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      items: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -569,6 +591,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.items=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -698,24 +721,7 @@ export default {
       })
     },
     handleTurnDown(val) {
-      this.$prompt('请输入驳回原因', '提示', {
-        confirmButtonText: '确认驳回',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        let data = {
-          ids: this.ids,
-          subId: this.subId,
-          remarks: value
-        }
-        handleTurnDownVessel(data).then(res => {
-          this.msgSuccess("驳回成功");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消驳回'
-        });
-      });
+        this.reason.open=true;
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -755,6 +761,17 @@ export default {
         this.getList();
       });
     },
+
+    reasonCancel() {
+      this.reason.open = false;
+    },
+    submitReasonForm(){
+      handleTurnDownVessel(this.items).then(res => {
+        this.msgSuccess("驳回成功");
+        this.reason.open = false;
+        this.$emit('refreshHisList');
+      })
+    }
   }
 };
 </script>