- PSSR气体检测仪台账优化

- PSSR开工方案移除导入功能

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

@@ -1,24 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--<el-form-item label="内容表id" prop="subId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.subId"-->
-          <!--placeholder="请输入内容表id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="审批id" prop="approveId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.approveId"-->
-          <!--placeholder="请输入审批id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
       <el-form-item label="检测器位号" prop="devNo">
         <el-input
           v-model="queryParams.devNo"
@@ -28,129 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="外观检查" prop="visualInspection">
-        <el-input
-          v-model="queryParams.visualInspection"
-          placeholder="请输入外观检查"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="防雨罩检查" prop="raincoverCheck">
-        <el-input
-          v-model="queryParams.raincoverCheck"
-          placeholder="请输入防雨罩检查"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="显示检查" prop="displayCheck">
-        <el-input
-          v-model="queryParams.displayCheck"
-          placeholder="请输入显示检查"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!--<el-form-item label="仪表检查人" prop="meterChecker">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.meterChecker"-->
-          <!--placeholder="请输入仪表检查人"-->
-          <!--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="确认人1" prop="confirm1">
-        <el-input
-          v-model="queryParams.confirm1"
-          placeholder="请输入确认人1"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="确认人2" prop="confirm2">
-        <el-input
-          v-model="queryParams.confirm2"
-          placeholder="请输入确认人2"
-          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="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -259,9 +118,6 @@
 
     <el-table v-loading="loading" :data="gasdetectorList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <!--<el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="内容表id" align="center" prop="subId" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>-->
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
       <template slot-scope="scope">
         <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
@@ -274,8 +130,6 @@
       <el-table-column label="外观检查" align="center" prop="visualInspection" :show-overflow-tooltip="true"/>
       <el-table-column label="防雨罩检查" align="center" prop="raincoverCheck" :show-overflow-tooltip="true"/>
       <el-table-column label="显示检查" align="center" prop="displayCheck" :show-overflow-tooltip="true"/>
-      <!--<el-table-column label="仪表检查人" align="center" prop="meterChecker" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="工艺确认人" align="center" prop="processValidator" :show-overflow-tooltip="true"/>-->
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
                        width="150">
         <template slot-scope="scope">
@@ -293,24 +147,10 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!--<el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
-        <!--</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">
-
           <el-button
             size="mini"
             type="text"
@@ -348,30 +188,21 @@
     <!-- 添加或修改气体检测器对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!--<el-form-item label="内容表id" prop="subId">-->
-          <!--<el-input v-model="form.subId" placeholder="请输入内容表id" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="审批id" prop="approveId">-->
-          <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
-        <!--</el-form-item>-->
         <el-form-item label="检测器位号" prop="devNo">
           <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 v-model="form.visualInspection" label="✔" border>✔</el-radio>
+          <el-radio v-model="form.visualInspection" label="✖" border>✖</el-radio>
         </el-form-item>
         <el-form-item label="防雨罩检查" prop="raincoverCheck">
-          <el-input v-model="form.raincoverCheck" placeholder="请输入防雨罩检查" />
+          <el-radio v-model="form.raincoverCheck" label="✔" border>✔</el-radio>
+          <el-radio v-model="form.raincoverCheck" label="✖" border>✖</el-radio>
         </el-form-item>
         <el-form-item label="显示检查" prop="displayCheck">
-          <el-input v-model="form.displayCheck" placeholder="请输入显示检查" />
+          <el-radio v-model="form.displayCheck" label="✔" border>✔</el-radio>
+          <el-radio v-model="form.displayCheck" label="✖" border>✖</el-radio>
         </el-form-item>
-        <!--<el-form-item label="仪表检查人" prop="meterChecker">-->
-          <!--<el-input v-model="form.meterChecker" placeholder="请输入仪表检查人" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="工艺确认人" prop="processValidator">-->
-          <!--<el-input v-model="form.processValidator" placeholder="请输入工艺确认人" />-->
-        <!--</el-form-item>-->
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人1">
@@ -398,40 +229,9 @@
             placeholder="选择确认时间">
           </el-date-picker>
         </el-form-item>
-        <!--<el-form-item label="删除状态" prop="delFlag">-->
-          <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="创建人" prop="createrCode">-->
-          <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="创建时间" prop="createdate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.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="form.updaterCode" placeholder="请输入修改人" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="修改时间" prop="updatedate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.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="form.deptId" placeholder="请输入部门编号" />-->
-        <!--</el-form-item>-->
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
-          <!--<el-form-item label="归属部门" prop="deptId">-->
-              <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
-          <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

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

@@ -61,17 +61,6 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:programme:edit']"
-          v-if="isApprove==0"
-        >导入
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"