Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/views/question/list/dialog.vue

@@ -234,7 +234,7 @@ export default {
     setTitle(type) {
       switch (type) {
         case "detail":
-          this.title = "详情";
+          this.title = "隐患问题详情";
           break;
         case "confirm":
           this.title = "隐患确认";

src/views/question/list/index.vue

@@ -124,7 +124,7 @@
             ></el-table-column>
             <el-table-column
               header-align="center"
-              label="所属机构"
+              label="机构名称"
               prop="orgName"
               v-if="columns[1].visible"
             />

src/views/question/reform/dialog.vue

@@ -226,7 +226,7 @@ export default {
     setTitle(type) {
       switch (type) {
         case "detail":
-          this.title = "详情";
+          this.title = "问题整改详情";
           break;
         case "confirm":
           this.title = "隐患确认";

src/views/question/reform/index.vue

@@ -107,7 +107,7 @@
             ></el-table-column>
             <el-table-column
               header-align="center"
-              label="所属机构"
+              label="机构名称"
               prop="orgName"
               v-if="columns[1].visible"
             />
@@ -278,7 +278,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.submitRange = null;
+      this.queryParams.reformRange = null;
       this.handleQuery();
     },
     // // 多选框选中数据

src/views/resumption/plan/dialog.edit.vue

@@ -638,7 +638,6 @@ export default {
           this.formData.count = 1;
           //履职内容
           this.tableData = null;
-          this.$refs["form"].resetFields();
       }
       this.changeBuildTime();
     },

src/views/safetycheck/taskManager/components/register.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-descriptions title="检查任务">
+    <el-descriptions title="检查任务" border>
       <el-descriptions-item label="任务名称">{{
         taskInfo.taskName
       }}</el-descriptions-item>

src/views/system/user/index.vue

@@ -68,7 +68,7 @@
                   style="width: 200px"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_user_is_lock"
+                    v-for="dict in dict.type.sys_normal_disable"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"