修复bug

273548560@qq.com
1 parent 0501e0e8
Showing 4 changed files with 26 additions and 19 deletions
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
@@ -247,7 +247,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="阅览人:">
-          <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择"/>
+          <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择" @select="handleSelect"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -498,6 +498,7 @@ export default {
       conferenceOpen: false,
       construct: false,
       leaveApplicationOpen: false,
+      userNodes:[],
     };
   },
   created() {
@@ -1004,11 +1005,12 @@ export default {
           this.$message.error("请选择阅览人！");
           return;
         }
-        let userNames = [];
-        for (let i in this.users) {
-          for (let j in this.options) {
-            if (this.users[i] == this.options[j].id) {
-              userNames.push(this.options[j].label);
+        const userNames = [];
+        const newArr = this.ArrSet(this.userNodes,"id");
+        for (let i = 0; i < newArr.length; i++) {
+          for (let j = 0; j < this.users.length; j++) {
+            if(newArr[i].id==this.users[j]){
+              userNames.push(newArr[i].label);
             }
           }
         }
@@ -1016,7 +1018,6 @@ export default {
         this.form.formData[0].userNames = userNames;
         //表里存中文
         handleAffairsForm.userNames = userNames.join(",");
-
         updateHandleAffairs(handleAffairsForm).then(res => {
           formDataSave(this.id, this.form.formData).then(response => {
             this.msgSuccess("审批成功");
@@ -1130,6 +1131,17 @@ export default {
         });
       });
     },
+    handleSelect(node){
+      this.userNodes.push(node);
+    },
+    ArrSet(Arr, id) {
+      var obj = {};
+      const arrays = Arr.reduce((setArr, item) => {
+        obj[item[id]] ? '' : obj[item[id]] = true && setArr.push(item);
+        return setArr;
+      }, []);
+      return arrays;
+    },
     getFile(file, fileList) {
       this.getBase64(file.raw).then(res => {
         const params = res
@@ -25,10 +25,10 @@
-      <el-form-item label="项目名称" prop="projectName">
+      <el-form-item label="违规对象" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
+          placeholder="请输入违规对象"
           size="small"
@@ -18,10 +18,10 @@
           <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
-      <el-form-item label="项目名称" prop="projectName">
+      <el-form-item label="违规对象" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
+          placeholder="请输入违规对象"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -82,17 +82,12 @@
       </el-table-column>
       <el-table-column label="违规类型" align="center" prop="violationType" />
       <el-table-column label="日期" align="center" prop="createTime"/>
-      <el-table-column label="审批状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span>{{parseStatus(scope.row.status) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleInfo(scope.row)"
             v-hasPermi="['casefile:violationWarningInformation:view']"
           >详情</el-button>
@@ -251,4 +246,4 @@
   </div>
 </template>
-<script src="../../../api/warningInfo"></script>
 \ No newline at end of file
+<script src="../../../api/warningInfo"></script>
@@ -81,7 +81,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 审批状态
      */
-    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
+//    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
     private Integer status;
     /**