feat:流程按钮调整

src/views/hiddenDanger/common.component.html

@@ -73,21 +73,21 @@
     <el-dialog :close-on-click-modal="false" :title="isReadonly?'详情':!updateParams.id?'新增':'编辑'"
         :visible.sync="showUpdate" width="980px" :before-close="handleClose" destroy-on-close>
         <div class="sub-title" v-if="isManager || isFile">隐患信息</div>
-        <FormComponent ref="form" :options="updateOptions"
+        <FormComponent ref="applyForm" :options="updateOptions"
             :isReadonly="isReadonly || ((isManager || isFile) && updateParams.status>1)" labelWidth="98px"
-            labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="updateActions"
+            labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]" :full-btn="true"
-            :full-btn="true" @change="change" btn-position="center"></FormComponent>
+            @change="change" btn-position="center"></FormComponent>
 
         <div class="sub-title"
             v-if="((isManager || isFile) && updateParams.status>1 && !(updateParams.status===2 && isReadonly)) 
             || ((isManager || isFile) && updateParams.reformConfirmFlag!==null && updateParams.reformConfirmFlag!==undefined)">隐患确认</div>
-        <FormComponent
+        <FormComponent ref="confirmForm"
             v-if="(isManager || isFile) && updateParams.status>1 && !(updateParams.status===2 && isReadonly)
             || ((isManager || isFile) && updateParams.reformConfirmFlag!==null && updateParams.reformConfirmFlag!==undefined)"
             :options="updateOptions2"
             :isReadonly="isReadonly || (isManager && updateParams.status>2)
             || ((isManager || isFile) && updateParams.status!==2 && updateParams.reformConfirmFlag!==null && updateParams.reformConfirmFlag!==undefined)"" labelWidth="
-            110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="updateActions"
+            110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]"
             :full-btn="true" @change="change" btn-position="center"></FormComponent>
 
 
@@ -95,27 +95,34 @@
             v-if="((isManager || isFile) && updateParams.status>2 && !(updateParams.status===3 && isReadonly))
             || ((isManager || isFile) && updateParams.executeConfirmFlag!==null && updateParams.executeConfirmFlag!==undefined)">隐患整改
         </div>
-        <FormComponent
+        <FormComponent ref="administerForm"
             v-if="((isManager || isFile) && updateParams.status>2 && !(updateParams.status===3 && isReadonly))
             || ((isManager || isFile) && updateParams.executeConfirmFlag!==null && updateParams.executeConfirmFlag!==undefined)"
             :options="updateOptions3"
             :isReadonly="isReadonly || (isManager && updateParams.status>3)
             || ((isManager || isFile) && updateParams.status!==3 && updateParams.executeConfirmFlag!==null && updateParams.executeConfirmFlag!==undefined)"
-            labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback"
+            labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]"
-            :actions="updateActions" :full-btn="true" @change="change" btn-position="center"></FormComponent>
+            :full-btn="true" @change="change" btn-position="center"></FormComponent>
 
 
         <div class="sub-title"
             v-if="((isManager || isFile) && updateParams.status>3 && !(updateParams.status===4 && isReadonly))
             || ((isManager || isFile) && updateParams.verifyConfirmFlag!==null && updateParams.verifyConfirmFlag!==undefined)">隐患验证</div>
-        <FormComponent
+        <FormComponent ref="checkForm"
             v-if="(isManager && updateParams.status>3 && !(updateParams.status===4 && isReadonly))
             || ((isManager || isFile) && updateParams.verifyConfirmFlag!==null && updateParams.verifyConfirmFlag!==undefined)"
             :options="updateOptions4"
             :isReadonly="isReadonly || (isManager && updateParams.status>4)
             || ((isManager || isFile) && updateParams.status!==4 && updateParams.verifyConfirmFlag!==null && updateParams.verifyConfirmFlag!==undefined)"
-            labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback"
+            labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]"
-            :actions="updateActions" :full-btn="true" @change="change" btn-position="center"></FormComponent>
+            :full-btn="true" @change="change" btn-position="center"></FormComponent>
+
+
+        <div style="text-align: center;">
+            <button-list-component v-if="!isReadonly" @callback="buttonCallback($event)" :actions="updateActions"
+                :full-btn="false"  ></button-list-component>
+        </div>
+
     </el-dialog>
 
 

src/views/hiddenDanger/manager.component.vue

@@ -8,6 +8,7 @@ import WorkFlowService from "@/service/workFlow.service";
 import FormOption from "hbt-common/models/formOptions";
 import BtnOption from "hbt-common/models/btnOptions";
 import MapComponent from "@/components/map.component.vue";
+import ButtonListComponent from "hbt-common/components/common/buttonList.component.vue"
 import ManagerService from "@/service/manager.service";
 import mapboxgl from "mapbox-gl";
 import moment from "moment";
@@ -17,6 +18,7 @@ import moment from "moment";
     FormComponent,
     TableComponent,
     MapComponent,
+    ButtonListComponent
   },
 } as any)
 export default class HiddenDangerManagerComponent extends BaseRecordComponent<any> {
@@ -1027,9 +1029,9 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
   public changeStatus(data, newStatus) {
     this.$confirm(
       "确认要" +
-        (newStatus === 1
+      (newStatus === 1
-          ? "中断数据？"
+        ? "中断数据？"
-          : newStatus === 3
+        : newStatus === 3
           ? "作废数据？"
           : "恢复数据？"),
       "操作确认",
@@ -1049,8 +1051,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             newStatus === 1
               ? "中断成功"
               : newStatus === 3
-              ? "作废成功"
+                ? "作废成功"
-              : "恢复成功"
+                : "恢复成功"
           );
           this.getTableData();
         });
@@ -1153,13 +1155,41 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         } else {
           return (
             time.getTime() <
-              moment(start).subtract(1, "day").toDate().getTime() ||
+            moment(start).subtract(1, "day").toDate().getTime() ||
             time.getTime() > moment(end).toDate().getTime()
           );
         }
       },
     };
   }
+  public buttonCallback(action) {
+    if (action.value.indexOf("submit") >= 0 || action.value.indexOf("save") >= 0) {
+      let formRef: any;
+      if (this.updateParams.status === 0 || this.updateParams.status === 1) {
+        formRef = this.$refs.applyForm; 
+        if (formRef.vaildParams()) {
+          this.callback(action)
+        }
+      }else if(this.updateParams.status === 2){
+        formRef = this.$refs.confirmForm; 
+        if (formRef.vaildParams()) {
+          this.callback(action)
+        }
+      }else if(this.updateParams.status === 3){
+        formRef = this.$refs.administerForm; 
+        if (formRef.vaildParams()) {
+          this.callback(action)
+        }
+      }else if(this.updateParams.status === 4){
+        formRef = this.$refs.checkForm; 
+        if (formRef.vaildParams()) {
+          this.callback(action)
+        }
+      }
+    } else {
+      this.callback(action)
+    }
+  }
 
   public callback(data, type?) {
     if (type) {
@@ -1246,7 +1276,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             this.$store.getters.prevention_danger_resource_map[row.source],
           attributeClassifyName:
             this.$store.getters.prevention_safe_reason_map[
-              row.attributeClassify
+            row.attributeClassify
             ],
           classifyName:
             this.$store.getters.prevention_dangrous_type_map[row.classify],
@@ -1254,14 +1284,14 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             this.$store.getters.prevention_danger_type_map[row.dangerType],
           inspectTypeName:
             this.$store.getters.prevention_danger_check_type_map[
-              row.inspectType
+            row.inspectType
             ],
           levelName: this.levelMap[row.level],
           occurNodeName:
             this.$store.getters.prevention_occur_step_map[row.occurNode],
           professionClassifyName:
             this.$store.getters.prevention_major_type_map[
-              row.professionClassify
+            row.professionClassify
             ],
           reformModeName: this.reformModeMap[row.reformMode],
           majorHazard: null,
@@ -1275,8 +1305,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
       this.updateParams.majorHazardName = !this.updateParams.majorHazard
         ? "不涉及"
         : this.$store.getters.prevention_risk_source_map[
-            this.updateParams.majorHazard
+        this.updateParams.majorHazard
-          ];
+        ];
       const option = this.updateOptions.find(
         (item) => item.key === "processStartTime"
       ) as any;
@@ -1364,8 +1394,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         data: JSON.stringify(this.updateParams),
         code: "prevention-yhzl",
         application: "hbt-prevention",
-        processInstanceId:this.updateParams.taskInfo?.processInstanceId,
+        processInstanceId: this.updateParams.taskInfo?.processInstanceId,
-        schemeDetailId:this.updateParams.taskInfo?.schemeDetailId
+        schemeDetailId: this.updateParams.taskInfo?.schemeDetailId
       },
       candidateInfos: [],
     };
@@ -1382,7 +1412,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         userIds = [this.updateParams.executeUserId];
       } else {
         this.updateParams.status -= 1;
-        handleParams.type = 0;
+        handleParams.type = 1;
       }
       this.updateParams.realConfirmTime = moment().format(
         "YYYY-MM-DD HH:mm:ss"
@@ -1394,7 +1424,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         userIds = [this.updateParams.verifyUserId];
       } else {
         this.updateParams.status -= 1;
-        handleParams.type = 0;
+        handleParams.type = 1;
       }
       this.updateParams.realExecuteTime = moment().format(
         "YYYY-MM-DD HH:mm:ss"
@@ -1405,7 +1435,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         this.updateParams.status += 1;
       } else {
         this.updateParams.status -= 1;
-        handleParams.type = 0;
+        handleParams.type = 1;
       }
       this.updateParams.realVerifyTime = moment().format("YYYY-MM-DD HH:mm:ss");
     }
@@ -1672,7 +1702,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
   border-radius: 0px !important;
 }
 
-.el-radio-button__orig-radio:checked + .el-radio-button__inner {
+.el-radio-button__orig-radio:checked+.el-radio-button__inner {
   border-bottom: 2px solid #409eff !important;
 }
 </style>

src/views/integral/exchange/exchangeFlow/exchange.component.vue

@@ -637,7 +637,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
             } else {
                 if (this.updateParams.approvalResult === 0) {
                     this.updateParams.status = 1
-                    tmpParam.type = 0
+                    tmpParam.type = 1
                 } else if (this.updateParams.approvalResult === 1) {
                     this.updateParams.status = 3
                     tmpParam.type = 1