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

src/views/check/dialog.edit.vue

@@ -599,6 +599,7 @@ export default {
       this.checkOrgIds = null;
       this.formData.checkOrgList = [];
       this.formData.checkOrgIds = [];
+      this.tableData=[];
     },
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {

src/views/core/edu/task/dialog.newTask.vue

@@ -272,10 +272,23 @@ export default {
     fileSelected(list) {
       if (!list) return;
       let tempArry = [];
+      let fileNameList=[]
+      let addFileNameList=[]
+      this.formData.fileList.forEach(x => {
+        let fileObj= JSON.parse(x);
+        fileNameList.push(fileObj.name);
+      })
       list.forEach(x => {
-        tempArry = tempArry.concat(x.fileList);
+        tempArry.forEach(s => {
+          addFileNameList.push(JSON.parse(s).name);
+        })
+        x.fileList.forEach(y => {
+          let fileObj= JSON.parse(y);
+          if (fileNameList.indexOf(fileObj.name) == -1&&addFileNameList.indexOf(fileObj.name) == -1) {
+            tempArry.push(y);
+          }
+        })
       })
-      console.log("tempArry", tempArry, this.formData.fileList);
       if (this.formData.fileList) {
         this.formFileListDefualtValue = this.formData.fileList.concat(tempArry);
       } else {

src/views/core/edu/task/dialog.perform.vue

@@ -394,18 +394,27 @@ export default {
       }
     },
     fileSelected(list) {
-
       if (!list) return;
       let tempArry = [];
+      let fileNameList=[]
+      let addFileNameList=[]
+      this.formData.fileList.forEach(x => {
+        let fileObj= JSON.parse(x);
+        fileNameList.push(fileObj.name);
+      })
       list.forEach(x => {
-        tempArry = tempArry.concat(x.fileList);
+        tempArry.forEach(s => {
+          addFileNameList.push(JSON.parse(s).name);
+        })
+        x.fileList.forEach(y => {
+          let fileObj= JSON.parse(y);
+          if (fileNameList.indexOf(fileObj.name) == -1&&addFileNameList.indexOf(fileObj.name) == -1) {
+            tempArry.push(y);
+          }
+        })
       })
-      console.log("tempArry", tempArry, this.formData.fileList);
       if (this.formData.fileList) {
-        console.log("12312312121212121212121")
         this.formFileListDefualtValue = this.formData.fileList.concat(tempArry);
-        this.formData.fileList = this.formData.fileList.concat(tempArry);
-        console.log("this.formFileListDefualtValue", this.formFileListDefualtValue)
       } else {
         this.formFileListDefualtValue = tempArry;
       }

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/resumption/plan/index.vue

@@ -77,8 +77,8 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
+              <!-- </el-row>
+              <el-row> -->
                 <el-form-item prop="planStatus" label="任务状态">
                   <el-select
                     prop="planStatus"

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/scorestatistics/pointsDialog.vue

@@ -43,20 +43,20 @@
         align="center"
         fixed
       >
-        <el-table-column label="事件单号" prop="resumptionTaskName"> </el-table-column>
-        <el-table-column label="事件名称" prop="resumptionTaskName"> </el-table-column>
+        <el-table-column label="事件单号" prop="id"> </el-table-column>
+        <el-table-column label="事件名称" prop="taskName"> </el-table-column>
         <el-table-column label="执行机构" prop="orgName"> </el-table-column>
-        <el-table-column label="执行人员" prop="execManName"> </el-table-column>
+<!--        <el-table-column label="执行人员" prop="execManName"> </el-table-column>-->
         <el-table-column label="执行岗位" prop="execPostName"> </el-table-column>
         <el-table-column label="计划开始时间" prop="planTimeStart">
         </el-table-column>
         <el-table-column label="计划结束时间" prop="planTimeEnd">
         </el-table-column>
-        <el-table-column label="执行开始时间" prop="execTimeStart">
+<!--        <el-table-column label="执行开始时间" prop="execTimeStart">
         </el-table-column>
         <el-table-column label="执行结束时间" prop="execTimeEnd">
         </el-table-column>
-        <el-table-column label="状态" prop="execStatusText"> </el-table-column>
+        <el-table-column label="状态" prop="execStatusText"> </el-table-column>-->
       </el-table>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->

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"
@@ -248,7 +248,7 @@
             >
               <template slot-scope="scope">
                 <dict-tag
-                  :options="dict.type.sys_user_is_lock"
+                  :options="dict.type.sys_normal_disable"
                   :value="scope.row.isLock"
                 />
               </template>