PSSR锁开锁管阀门状态台账优化

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

@@ -19,15 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="位置" prop="position">
-        <el-input
-          v-model="queryParams.position"
-          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>
@@ -70,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-if="isApprove==0"
-                v-hasPermi="['pssr:lock:edit']"
-              >导入
-              </el-button>
-            </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -178,7 +158,6 @@
         </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">
@@ -235,7 +214,7 @@
         </el-form-item>
         <el-form-item label="检查人" prop="lockeder">
           <el-select v-model="form.lockeder" clearable filterable style="width: 100%;"
-                     placeholder="请选择确认人1">
+                     placeholder="请选择检查人">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"
@@ -244,16 +223,13 @@
         </el-form-item>
         <el-form-item label="确认人" prop="confirm">
           <el-select v-model="form.confirm" clearable filterable style="width: 100%;"
-                     placeholder="请选择确认人2">
+                     placeholder="请选择确认人">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注"/>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -261,9 +237,27 @@
       </div>
     </el-dialog>
 
-    <el-dialog :close-on-click-modal="false" :title="title" v-if="isApprove!=0" :visible.sync="approveOpen"
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="approveOpen"
                width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
+        <el-form-item label="检查人" prop="lockeder">
+          <el-select v-model="form.lockeder" clearable filterable style="width: 100%;"
+                     placeholder="请选择检查人">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人" prop="confirm">
+          <el-select v-model="form.confirm" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="位置正确(✔/✖)" prop="positionRight">
           <el-radio v-model="form.positionRight" label="✔" border>✔</el-radio>
           <el-radio v-model="form.positionRight" label="✖" border>✖</el-radio>
@@ -284,7 +278,7 @@
           <el-radio v-model="form.noDamage" label="✔" border>✔</el-radio>
           <el-radio v-model="form.noDamage" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate" v-if="isApprove==5">
+        <el-form-item label="确认时间" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"
@@ -292,9 +286,6 @@
                           placeholder="选择确认时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注"/>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -570,6 +561,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.approveOpen = false;
       this.reset();
     },
     // 表单重置
@@ -639,13 +631,14 @@ export default {
       const id = row.id || this.ids
       getLock(id).then(response => {
         this.form = response.data;
-        if (response.data.approveStatus != 2) {
-          if (this.isApprove == 0) {
-            this.open = true;
-          } else {
-            this.approveOpen = true;
-          }
-        }
+        // if (response.data.approveStatus != 2) {
+        //   if (this.isApprove == 0) {
+        //     this.open = true;
+        //   } else {
+        //     this.approveOpen = true;
+        //   }
+        // }
+        this.approveOpen = true;
         this.form.pidNos = []
         this.form.pidNos.push(this.form.pidNo);
         this.title = "修改锁开锁关阀门状态";
@@ -659,6 +652,7 @@ export default {
             updateLock(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
+              this.approveOpen = false;
               this.getList();
             });
           } else {