修复bug

273548560@qq.com
1 parent baafd814
Showing 3 changed files with 329 additions and 250 deletions
trash-ui/src/views/activiti/taskhistory/index.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
trash-ui/src/views/h5/taskhistory/index.vue
 <template>
   <div class="app-container">
  
-    <taskCard :task="task"  v-for="task in taskList" @sendToParent="showTask"/>
+    <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
  
-    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
  
     <!-- 审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
@@ -14,11 +15,11 @@
       </div>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
-      <threestepInfo :businessKey="businessKey"  v-if="open2"/>
-      </el-dialog>
+      <threestepInfo :businessKey="businessKey" v-if="open2"/>
+    </el-dialog>
  
     <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
-      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
+      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/>
     </el-dialog>
     <!--  会议管理  -->
     <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
@@ -32,15 +33,14 @@
  
  
     <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
-      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <earthsitesInfo :businessKey="businessKey" v-if="earthsites"/>
     </el-dialog>
  
     <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
-      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <contractInfo :businessKey="businessKey" v-if="contract"/>
     </el-dialog>
  
  
-
     <!--  后勤管理  -->
     <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
                :close-on-click-modal="false">
@@ -61,265 +61,307 @@
     </el-dialog>
  
     <!--  平台违规信息  -->
-    <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body
+               :close-on-click-modal="false">
       <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
     </el-dialog>
  
     <!--  违规预警信息  -->
-    <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body
+               :close-on-click-modal="false">
       <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body
+               :close-on-click-modal="false">
       <supervisionInfo :infoData="supervisionData"/>
     </el-dialog>
   </div>
 </template>
  
  
-
 <script>
-  import {
-    listEndTask,
-    listTask,
-    formDataShow
-  } from "@/api/activiti/taskhistory";
-
-  import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
-  import taskCard from "@/views/activiti/task/taskCard";
-  import earthSitesForm from "@/views/workflow/earthSitesForm";
-  import threestepInfo from "@/views/business/threestep/threestepInfo";
-  import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
-  import conferenceInfo from "@/views/office/conference/conferenceInfo";
-  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
-  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
-  import contractInfo from "@/views/activiti/task/contractInfo";
-  import logisticsInfo from "@/views/office/logistics/logisticsInfo";
-  import handleInfo from "@/views/office/handle/handleInfo";
-  import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
-  import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
-  import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
-  import supervisionInfo from "../task/SupervisionInfo";
-
-
-
-  export default {
-    name: "taskHistory",
-    props: {
-      type: {
-        type: Number
+import {
+  listEndTask,
+  listTask,
+  formDataShow
+} from "@/api/activiti/taskhistory";
+
+import {getSignByObjId, addSign, updateSign} from "@/api/sign/sign";
+import taskCard from "@/views/activiti/task/taskCard";
+import earthSitesForm from "@/views/workflow/earthSitesForm";
+import threestepInfo from "@/views/business/threestep/threestepInfo";
+import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
+import conferenceInfo from "@/views/office/conference/conferenceInfo";
+import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
+import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
+import contractInfo from "@/views/activiti/task/contractInfo";
+import logisticsInfo from "@/views/office/logistics/logisticsInfo";
+import handleInfo from "@/views/office/handle/handleInfo";
+import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
+import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+import violationWarningInformationInfo
+  from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+import supervisionInfo from "../task/SupervisionInfo";
+import {getDict} from "@/api/dict";
+
+
+export default {
+  name: "taskHistory",
+  props: {
+    type: {
+      type: Number
+    }
+  },
+  components: {
+    taskCard,
+    threestepInfo,
+    conferenceInfo,
+    leaveApplicationInfo,
+    logisticsInfo,
+    handleInfo,
+    constructsiteInfo,
+    earthsitesInfo,
+    contractInfo,
+    caseOfflineInfo,
+    violationCaseFileInfo,
+    violationWarningInformationInfo,
+    supervisionInfo
+  },
+  data() {
+    return {
+      id: '',
+      definitionKey: '',
+      businessKey: '',
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 请假表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {
+        formData: []
+      },
+      needShow: false,
+      // 表单校验
+      rules: {},
+      uploadImageDialog: false,
+      idInfo: null,
+      signData: null,
+      supervisionData: null,
+      // 是否显示弹出层
+      earthsites: false,
+      contract: false,
+      logisticsInfoOpen: false,
+      handleAffairsInfoOpen: false,
+      caseOffline: false,
+      violationCaseFile: false,
+      violationCaseFile1: false,
+      supervisionOpen: false,
+      open: false,
+      open2: false,
+      conferenceOpen: false,
+      construct: false,
+      leaveApplicationOpen: false,
+    };
+  },
+  created() {
+    let dep = {type: "CSUserDepartmentType"};
+
+    getDict(dep).then(res => {
+      this.depts = res.result;
+    });
+
+    let role = {type: "CSUserPostType"};
+
+    getDict(role).then(res => {
+      this.roles = res.result;
+    });
+    this.getList();
+  },
+  methods: {
+    /** 查询请假列表 */
+    getList() {
+      this.loading = true;
+      if (this.type == 1) {
+        listEndTask(this.queryParams).then(response => {
+          this.taskList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else {
+        listTask(this.queryParams).then(response => {
+          this.taskList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
       }
     },
-    components: {
-      taskCard,
-      threestepInfo,
-      conferenceInfo,
-      leaveApplicationInfo,
-      logisticsInfo,
-      handleInfo,
-      constructsiteInfo,
-      earthsitesInfo,
-      contractInfo,
-      caseOfflineInfo,
-      violationCaseFileInfo,
-      violationWarningInformationInfo,
-      supervisionInfo
+
+    // 取消按钮
+    cancel() {
+      this.earthsites = false;
+      this.contract = false;
+      this.logisticsInfoOpen = false;
+      this.handleAffairsInfoOpen = false;
+      this.caseOffline = false;
+      this.violationCaseFile = false;
+      this.violationCaseFile1 = false;
+      this.supervisionOpen = false;
+      this.open = false;
+      this.open2 = false;
+      this.conferenceOpen = false;
+      this.construct = false;
+      this.leaveApplicationOpen = false;
+      this.reset();
     },
-    data() {
-      return {
-        id: '',
-        definitionKey: '',
-        businessKey: '',
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 请假表格数据
-        taskList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        open2:false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        // 表单参数
-        form: {
-          formData: []
-        },
-        needShow:false,
-        // 表单校验
-        rules: {},
-
-        uploadImageDialog: false,
-        conferenceOpen: false,
-        construct:false,
-        idInfo:null,
-        leaveApplicationOpen:false,
-        signData:null,
-        earthsites:false,
-        contract:false,
+    // 表单重置
+    reset() {
+      this.definitionKey = '';
+      this.businessKey = '';
+      this.form = {
+        formData: [],
       };
+      this.resetForm("form");
     },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询请假列表 */
-      getList() {
-        this.loading = true;
-        if(this.type == 1){
-          listEndTask(this.queryParams).then(response => {
-            this.taskList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }else{
-          listTask(this.queryParams).then(response => {
-            this.taskList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-      },
-
-      // 取消按钮
-      cancel() {
-        this.open = false;
-
-        this.earthsites=false;
-        this.contract=false;
-        this.logisticsInfoOpen=false;
-        this.handleAffairsInfoOpen=false;
-        this.caseOffline=false;
-        this.violationCaseFile=false;
-        this.violationCaseFile1=false;
-        this.supervisionOpen=false;
-        this.open=false;
-        this.open2=false;
-        this.conferenceOpen=false;
-        this.construct=false;
-        this.leaveApplicationOpen=false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.definitionKey = '',
-          this.businessKey = '',
-          this.form = {
-            formData: [],
-          };
-        this.resetForm("form");
-      },
-      showTask(row,idx) {
-
-        this.needShow = false;
-        this.reset();
-        this.definitionKey = row.definitionKey;
-        this.businessKey = row.businessKey;
-        this.id = row.id;
-
-        this.title = "详情";
-
-        if(this.definitionKey == "conference"){
-          this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
-          this.conferenceOpen = true;
-          return;
+    showTask(row, idx) {
+      this.needShow = false;
+      this.reset();
+      this.definitionKey = row.definitionKey;
+      this.businessKey = row.businessKey;
+      this.id = row.id;
+
+      this.title = "详情";
+      formDataShow(row.id).then(response => {
+        let datas = response.data;
+        let formData = []
+        for (let i = 0; i < datas.length; i++) {
+          let strings = datas[i].split('--__!!')
+          let controlValue = null
+          let controlDefault = null
+          switch (strings[1]) {
+            case 'radio':
+              controlValue = idx;
+              controlDefault = strings[4]
+              break;
+            // default:
+          }
+          formData.push({
+            controlId: strings[0],
+            controlType: strings[1],
+            controlLable: strings[2],
+            controlIsParam: strings[3],
+            controlValue: controlValue,
+            controlDefault: controlDefault
+          })
         }
-        if(this.definitionKey == "workflow_leave"){
-          this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
-          this.leaveApplicationOpen = true;
+        if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {
+          this.controlId = formData[0].controlId;
+          this.idInfo = row.businessKey.split(":")[1];
+          this.handleAffairsInfoOpen = true;
           return;
         }
+      });
  
-        if(this.definitionKey == "workflow_constructsite"){
-          getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
-              this.signData = res;
-              this.construct = true;
-          });
-          return;
-        }
-          if(this.definitionKey == "workflow_earthsites"){
-            this.earthsites = true;
-            return;
-          }
-          if(this.definitionKey == "workflow_conract"){
-            this.contract = true;
-            return;
-          }
+      if (this.definitionKey == "conference") {
+        this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":") + 1);
+        this.conferenceOpen = true;
+        return;
+      }
+      if (this.definitionKey == "workflow_leave") {
+        this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
+        this.leaveApplicationOpen = true;
+        return;
+      }
  
+      if (this.definitionKey == "workflow_constructsite") {
+        getSignByObjId(this.businessKey.split(":")[1]).then(res => {
+          this.signData = res;
+          this.construct = true;
+        });
+        return;
+      }
+      if (this.definitionKey == "workflow_earthsites") {
+        this.earthsites = true;
+        return;
+      }
+      if (this.definitionKey == "workflow_conract") {
+        this.contract = true;
+        return;
+      }
  
-        if(this.definitionKey == "workflow_threestep"){
-          this.open2 = true;
-          return;
-        }
  
-          if (this.definitionKey == "logistics") {
-            this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
-            this.logisticsInfoOpen = true;
-            return;
-          }
-          if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey=="yuelanxuexi") {
-            this.controlId = this.form.formData[0].controlId;
-            this.idInfo = row.businessKey.split(":")[1];
-            this.handleAffairsInfoOpen = true;
-            return;
-          }
-          if(this.definitionKey == "workflow_caseoffline"){
-            this.caseOffline = true;
-            return;
-          }
+      if (this.definitionKey == "workflow_threestep") {
+        this.open2 = true;
+        return;
+      }
  
-          if(this.definitionKey == "workflow_casefile"){
-            this.violationCaseFile = true;
-            return;
-          }
+      if (this.definitionKey == "logistics") {
+        this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
+        this.logisticsInfoOpen = true;
+        return;
+      }
  
-          if(this.definitionKey == "violation_warning"){
-            this.violationCaseFile1 = true;
-            return;
-          }
+      if (this.definitionKey == "workflow_caseoffline") {
+        this.caseOffline = true;
+        return;
+      }
+
+      if (this.definitionKey == "workflow_casefile") {
+        this.violationCaseFile = true;
+        return;
+      }
+
+      if (this.definitionKey == "violation_warning") {
+        this.violationCaseFile1 = true;
+        return;
+      }
  
-          if(this.definitionKey.indexOf("supervision")>-1){
-            const params = {
-              id: row.businessKey.split(":")[1],
-            }
-            getSupervision(params).then(res=>{
-              if(res.result==null){
-                this.$message.error("获取纪检督察详情失败！请重试")
-                return;
-              }
-              this.supervisionData = res.result;
-              this.supervisionOpen = true;
-            })
+      if (this.definitionKey.indexOf("supervision") > -1) {
+        const params = {
+          id: row.businessKey.split(":")[1],
+        }
+        getSupervision(params).then(res => {
+          if (res.result == null) {
+            this.$message.error("获取纪检督察详情失败！请重试")
             return;
           }
+          this.supervisionData = res.result;
+          this.supervisionOpen = true;
+        })
+        return;
+      }
  
  
-      },
-      /** 提交按钮 */
-      submitForm() {
-        formDataSave(this.id, this.form.formData).then(response => {
-          this.msgSuccess("审批成功");
-          this.open = false;
-          this.getList();
-        });
-      },
-    }
-  };
+    },
+    /** 提交按钮 */
+    submitForm() {
+      formDataSave(this.id, this.form.formData).then(response => {
+        this.msgSuccess("审批成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+  }
+};
 </script>
  
 <style>
-  @import '../../../assets/css/task.css'
+@import '../../../assets/css/task.css';
 </style>
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="115px">
+  <el-form ref="form" :model="form" label-width="115px">
     <el-row :gutter="2">
       <el-col :span="11">
         <el-form-item label="案卷编号" prop="number">
@@ -91,6 +91,7 @@
   import caseOfflineInfo from "@/views/h5/caseOffline/caseOfflineInfo";
   import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
   import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
+  import {getDict} from "@/api/dict";
  
   export default {
     name: "taskHistory",
@@ -136,9 +137,6 @@
         taskList: [],
         // 弹出层标题
         title: "",
-        // 是否显示弹出层
-        open: false,
-        open2:false,
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -153,22 +151,37 @@
         rules: {},
  
         uploadImageDialog: false,
-        conferenceOpen: false,
-        construct:false,
         idInfo:null,
-        leaveApplicationOpen:false,
         signData:null,
-        earthsites:false,
-        contract:false,
-        supervisionOpen:false,
+        supervisionData: null,
+        // 是否显示弹出层
+        earthsites: false,
+        contract: false,
         logisticsInfoOpen: false,
         handleAffairsInfoOpen: false,
         caseOffline: false,
         violationCaseFile: false,
         violationCaseFile1: false,
+        supervisionOpen: false,
+        open: false,
+        open2: false,
+        conferenceOpen: false,
+        construct: false,
+        leaveApplicationOpen: false,
       };
     },
     created() {
+      let dep = {type: "CSUserDepartmentType"};
+
+      getDict(dep).then(res => {
+        this.depts = res.result;
+      });
+
+      let role = {type: "CSUserPostType"};
+
+      getDict(role).then(res => {
+        this.roles = res.result;
+      });
       this.getList();
     },
     methods: {
@@ -228,7 +241,36 @@
         this.id = row.id;
  
         this.title = "详情";
-
+        formDataShow(row.id).then(response => {
+          let datas = response.data;
+          let formData = []
+          for (let i = 0; i < datas.length; i++) {
+            let strings = datas[i].split('--__!!')
+            let controlValue = null
+            let controlDefault = null
+            switch (strings[1]) {
+              case 'radio':
+                controlValue = idx;
+                controlDefault = strings[4]
+                break;
+              // default:
+            }
+            formData.push({
+              controlId: strings[0],
+              controlType: strings[1],
+              controlLable: strings[2],
+              controlIsParam: strings[3],
+              controlValue: controlValue,
+              controlDefault: controlDefault
+            })
+          }
+          if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {
+            this.controlId = formData[0].controlId;
+            this.idInfo = row.businessKey.split(":")[1];
+            this.handleAffairsInfoOpen = true;
+            return;
+          }
+        });
         if(this.definitionKey == "conference"){
           this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
           this.conferenceOpen = true;
@@ -267,11 +309,6 @@
             this.logisticsInfoOpen = true;
             return;
           }
-          if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey=="yuelanxuexi") {
-            this.idInfo = row.businessKey.split(":")[1];
-            this.handleAffairsInfoOpen = true;
-            return;
-          }
           if(this.definitionKey == "workflow_caseoffline"){
             this.caseOffline = true;
             return;
@@ -314,4 +351,4 @@
   .el-select-dropdown__item{
     width:300px;
   }
-</style>
 \ No newline at end of file
+</style>