Browse Source

coding...

刘洋 9 months ago
parent
commit
b0c5b07fbd

+ 5 - 2
src/views/my-workbenches/workbenches/message-reminder/message-list.vue

@@ -5,7 +5,7 @@
       v-for="item in tableData"
       :key="item.id"
     >
-      <div v-if="IS_CYTX(item)" @click="editSopFlowHandle(item)">
+      <div v-if="IS_CYTX(item)" @click="editSopFlowHandle(item, true)">
         <div class="m-head">
           <div class="cytx m-title flex items-center">
             <span>查阅提醒</span>
@@ -144,7 +144,7 @@ const showViolationFlowDialog = ref(false);
 const curSopData = ref({});
 const curRow = ref({});
 
-const editSopFlowHandle = (row) => {
+const editSopFlowHandle = (row, is_cytx) => {
   curRow.value = row;
   // if (row.messageType === 'AFTER' || row.messageType === 'BEFORE') {
   if (
@@ -166,6 +166,9 @@ const editSopFlowHandle = (row) => {
       if (res.records.length) {
         curSopData.value = res.records[0];
         showSopStepDialog.value = true;
+        if (is_cytx && curSopData.value) {
+          sessionStorage.setItem('switchSetup', row.setup);
+        }
       } else {
         MessagePlugin.error('未找到对应的SOP');
       }

+ 2 - 2
src/views/sop/components/dynamic-form-item/LABEL.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="label">
-    <view
+    <div
       v-for="(item, index) in titleArr"
       :key="index"
       :style="{ color: item.color }"
-      >{{ item.label }}</view
+      >{{ item.label }}</div
     >
   </div>
 </template>

+ 6 - 0
src/views/sop/sop-manage/sop-step/index.vue

@@ -461,6 +461,12 @@ const initFill = async () => {
   flowApproveHistoryList.value = getFlowApproveHistoryList(
     res.flowApproveHistoryList
   );
+  let switchSetup = sessionStorage.getItem('switchSetup');
+  if (switchSetup) {
+    let item = allSteps.value.find((item) => item.setup == switchSetup);
+    item && switchStep(item);
+    sessionStorage.removeItem('switchSetup');
+  }
 };
 const initEdit = async () => {
   loading.value = true;