修改

src/layout/components/TagsView/index.vue

@@ -146,22 +146,29 @@ export default {
     refreshSelectedTag(view) {
       this.$tab.refreshPage(view);
     },
+    closepage(view) {
+      this.$tab.closePage(view).then(({ visitedViews }) => {
+        if (this.isActive(view)) {
+          this.toLastView(visitedViews, view)
+        }
+      })
+    },
     closeSelectedTag(view) {
-      let url = view.fullPath.split('?')[1]
+      if (this.$route.path != view.path) {
-      let urls = new URLSearchParams('?' + url)
+        this.closepage(view);
-      let path = urls.get('path')
-      if (path) {
-        this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
-          this.$router.push({
-            path: path
-          });
-        })
       } else {
-        this.$tab.closePage(view).then(({ visitedViews }) => {
+        let url = view.fullPath.split('?')[1]
-          if (this.isActive(view)) {
+        let urls = new URLSearchParams('?' + url)
-            this.toLastView(visitedViews, view)
+        let path = urls.get('path')
-          }
+        if (path) {
-        })
+          this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+            this.$router.push({
+              path: path
+            });
+          })
+        } else {
+          this.closepage(view);
+        }
       }
     },
     closeRightTags() {

src/layout/index.vue

@@ -54,6 +54,11 @@ export default {
       return variables;
     }
   },
+  created() {
+    localStorage.removeItem('manualReviewquery')
+    localStorage.removeItem('signRecordquery')
+    localStorage.removeItem('followupquery')
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })

src/views/manage/manualReview/index.vue

@@ -228,6 +228,7 @@ export default {
       this.$router.push({
         path: "/task/LookAuditing",
         query: {
+          path: "/task/manualReview",
           patientId: row.patientId,
           signRecordId: row.id,
           routeCheckStatus: this.queryParams.routeCheckStatus,
@@ -239,6 +240,7 @@ export default {
       this.$router.push({
         path: "/task/Auditing",
         query: {
+          path: "/task/manualReview",
           patientId: row.patientId,
           signRecordId: row.id,
           routeCheckStatus: row.routeCheckStatus

src/views/system/editorialSpecialization/index.vue

@@ -8,13 +8,7 @@
         <!-- <el-button type="primary">发布</el-button> -->
       </el-form-item>
     </el-form>
-    <el-form
+    <el-form ref="form" :inline="true" :model="form" label-width="100px" :rules="rules">
-      ref="form"
-      :inline="true"
-      :model="form"
-      label-width="100px"
-      :rules="rules"
-    >
       <el-form-item label="路径名称" prop="routeName">
         <el-input v-model="form.routeName" style="width: 160px"></el-input>
       </el-form-item>
@@ -29,29 +23,13 @@
       <el-form-item style="float: right">
         <!-- <el-button type="primary" plain size="mini">AI生成触发条件</el-button> -->
         <!-- <el-button type="primary" plain size="mini" @click="add">人工添加主路径</el-button> -->
-        <el-button
+        <el-button type="primary" plain size="mini" @click="goManageNodeInformation">人工添加触发条件</el-button>
-          type="primary"
-          plain
-          size="mini"
-          @click="goManageNodeInformation"
-          >人工添加触发条件</el-button
-        >
       </el-form-item>
     </el-form>
     <el-form label-width="100px" ref="form" :model="form" :rules="rules">
       <el-form-item label="所属服务包" prop="servicePackageId">
-        <el-select
+        <el-select v-model="form.servicePackageId" placeholder="请选择所属服务包" style="width: 600px" multiple>
-          v-model="form.servicePackageId"
+          <el-option v-for="itemp in addpackagelist" :key="itemp.id" :label="itemp.packageName" :value="itemp.id" />
-          placeholder="请选择所属服务包"
-          style="width: 600px"
-          multiple
-        >
-          <el-option
-            v-for="itemp in addpackagelist"
-            :key="itemp.id"
-            :label="itemp.packageName"
-            :value="itemp.id"
-          />
         </el-select>
       </el-form-item>
     </el-form>
@@ -63,11 +41,7 @@
         </div>
         <div class="progress">
           <span>审核进度</span>
-          <el-progress
+          <el-progress :text-inside="true" :stroke-width="13" :percentage="list.percentage"></el-progress>
-            :text-inside="true"
-            :stroke-width="13"
-            :percentage="list.percentage"
-          ></el-progress>
           <span>{{ list.agreeNumber + " / " + list.totalNumber }}</span>
         </div>
         <div class="title" style="width: 240px">
@@ -77,10 +51,10 @@
             {{ list.suitRange == "DISCHARGE" ? "出院" : "" }}
             {{ list.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
             {{
-              list.suitRange == "OUTPATIENT_SERVICE_DISCHARGE"
+      list.suitRange == "OUTPATIENT_SERVICE_DISCHARGE"
-                ? "门诊+出院"
+        ? "门诊+出院"
-                : ""
+        : ""
-            }}
+    }}
           </span>
         </div>
         <div>
@@ -88,11 +62,7 @@
           <!-- <i class="el-icon-delete" @click.stop="delspecialDiseaseRoute"></i> -->
         </div>
       </div>
-      <div
+      <div class="item" v-for="(uitem, uindex) in list.childrenRouteList" :key="uindex">
-        class="item"
-        v-for="(uitem, uindex) in list.childrenRouteList"
-        :key="uindex"
-      >
         <!-- {{ uitem }} -->
         <div class="title">
           <el-tag type="success">触发条件</el-tag>
@@ -125,11 +95,7 @@
         </div>
         <div class="progress">
           <span>审核进度</span>
-          <el-progress
+          <el-progress :text-inside="true" :stroke-width="13" :percentage="uitem.percentage"></el-progress>
-            :text-inside="true"
-            :stroke-width="13"
-            :percentage="uitem.percentage"
-          ></el-progress>
           <span>{{ uitem.agreeNumber + " / " + uitem.totalNumber }}</span>
         </div>
         <div class="title" style="width: 240px">
@@ -139,10 +105,10 @@
             {{ uitem.suitRange == "DISCHARGE" ? "出院" : "" }}
             {{ uitem.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
             {{
-              uitem.suitRange == "OUTPATIENT_SERVICE_DISCHARGE"
+      uitem.suitRange == "OUTPATIENT_SERVICE_DISCHARGE"
-                ? "门诊+出院"
+        ? "门诊+出院"
-                : ""
+        : ""
-            }}
+    }}
           </span>
         </div>
         <div>
@@ -153,127 +119,57 @@
       </div>
     </div>
     <!-- 添加触发条件 -->
-    <el-dialog
+    <el-dialog title="添加触发条件" :visible.sync="open" width="800px" append-to-body>
-      title="添加触发条件"
-      :visible.sync="open"
-      width="800px"
-      append-to-body
-    >
       <el-form ref="updata" :model="updata" :rules="rules" label-width="80px">
         <el-form-item label="适用范围:">
-          <el-select
+          <el-select v-model="updata.suitRange" @change="changeoptions" style="width: 200px">
-            v-model="updata.suitRange"
+            <el-option v-for="xitem in options" :key="xitem.dictValue" :label="xitem.dictLabel"
-            @change="changeoptions"
+              :value="xitem.dictValue">
-            style="width: 200px"
-          >
-            <el-option
-              v-for="xitem in options"
-              :key="xitem.dictValue"
-              :label="xitem.dictLabel"
-              :value="xitem.dictValue"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-descriptions title="触发条件"> </el-descriptions>
 
-        <div
+        <div class="node" v-for="(item, index) in updata.triggerConditionList" :key="index">
-          class="node"
+          <div style="width: 600px; position: absolute; left: 2%; top: 57%"
-          v-for="(item, index) in updata.triggerConditionList"
+            v-if="updata.triggerConditionList.length === 3">
-          :key="index"
-        >
-          <div
-            style="width: 600px; position: absolute; left: 2%; top: 57%"
-            v-if="updata.triggerConditionList.length === 3"
-          >
             <img src="@/assets/images/images.png" class="login-code-img" />
-            <el-select
+            <el-select v-model="item.triggerLogic" style="width: 60px" placeholder=""
-              v-model="item.triggerLogic"
+              @change="changetriggerLogicsname($event, index)">
-              style="width: 60px"
+              <el-option v-for="itemh in optionslistS" :key="itemh.dictValue" :label="itemh.dictLabel"
-              placeholder=""
+                :value="itemh.dictValue">
-              @change="changetriggerLogicsname($event, index)"
-            >
-              <el-option
-                v-for="itemh in optionslistS"
-                :key="itemh.dictValue"
-                :label="itemh.dictLabel"
-                :value="itemh.dictValue"
-              >
               </el-option>
             </el-select>
           </div>
-          <el-select
+          <el-select v-model="item.triggerConditionCode" style="width: 120px"
-            v-model="item.triggerConditionCode"
+            @change="changetriggerConditionName($event, index)">
-            style="width: 120px"
+            <el-option v-for="itemq in optionsname" :key="itemq.dictValue" :label="itemq.dictLabel"
-            @change="changetriggerConditionName($event, index)"
+              :value="itemq.dictValue">
-          >
-            <el-option
-              v-for="itemq in optionsname"
-              :key="itemq.dictValue"
-              :label="itemq.dictLabel"
-              :value="itemq.dictValue"
-            >
             </el-option>
           </el-select>
-          <el-select
+          <el-select v-model="item.triggerConditionOperator" style="width: 100px"
-            v-model="item.triggerConditionOperator"
+            @change="changetriggerLogic($event, index)">
-            style="width: 100px"
+            <el-option v-for="itemr in item.optionstriggerConditionOperator" :key="itemr.dictValue"
-            @change="changetriggerLogic($event, index)"
+              :label="itemr.dictLabel" :value="itemr.dictValue">
-          >
-            <el-option
-              v-for="itemr in item.optionstriggerConditionOperator"
-              :key="itemr.dictValue"
-              :label="itemr.dictLabel"
-              :value="itemr.dictValue"
-            >
             </el-option>
           </el-select>
           <!-- {{ item }} -->
-          <el-input
+          <el-input v-if="item.dictDataType == 'STRING' || item.dictDataType == ''" v-model="item.triggerConditionValue"
-            v-if="item.dictDataType == 'STRING' || item.dictDataType == ''"
+            style="width: 300px" placeholder="请输入触发条件" maxlength="100"></el-input>
-            v-model="item.triggerConditionValue"
+          <el-date-picker v-if="item.dictDataType == 'DATE'" v-model="item.triggerConditionValue" style="width: 300px"
-            style="width: 300px"
+            type="date" placeholder="选择日期时间" value-format="yyyy-MM-dd">
-            placeholder="请输入触发条件"
-            maxlength="100"
-          ></el-input>
-          <el-date-picker
-            v-if="item.dictDataType == 'DATE'"
-            v-model="item.triggerConditionValue"
-            style="width: 300px"
-            type="date"
-            placeholder="选择日期时间"
-            value-format="yyyy-MM-dd"
-          >
           </el-date-picker>
-          <el-select
+          <el-select v-if="item.dictDataType == 'SELECT'" v-model="item.triggerConditionValue" style="width: 300px">
-            v-if="item.dictDataType == 'SELECT'"
+            <el-option v-for="item in ConditionValue" :key="item.dictValue" :label="item.dictLabel"
-            v-model="item.triggerConditionValue"
+              :value="item.dictValue">
-            style="width: 300px"
-          >
-            <el-option
-              v-for="item in ConditionValue"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            >
             </el-option>
           </el-select>
           <!-- {{ item }} -->
-          <el-input
+          <el-input v-if="item.dictDataType == 'DECIMAL'" style="width: 300px" v-model="item.triggerConditionValue"
-            v-if="item.dictDataType == 'DECIMAL'"
+            type="number" :min="0"></el-input>
-            style="width: 300px"
-            v-model="item.triggerConditionValue"
-            type="number"
-            :min="0"
-          ></el-input>
           <span class="icon">
-            <el-button
+            <el-button type="danger" class="el-icon-remove-outline" plain @click="delitem(index)"
-              type="danger"
+              v-if="index != 0"></el-button>
-              class="el-icon-remove-outline"
-              plain
-              @click="delitem(index)"
-              v-if="index != 0"
-            ></el-button>
 
             <!-- <i
               class="el-icon-delete"
@@ -286,14 +182,8 @@
               @click="addtriggerCondition(index)"
               >添加触发条件</i
             > -->
-            <el-button
+            <el-button type="primary" plain class="el-icon-circle-plus-outline" @click="addtriggerCondition(index)"
-              type="primary"
+              v-if="index == 0">添加属性</el-button>
-              plain
-              class="el-icon-circle-plus-outline"
-              @click="addtriggerCondition(index)"
-              v-if="index == 0"
-              >添加属性</el-button
-            >
           </span>
         </div>
       </el-form>
@@ -499,7 +389,7 @@ export default {
         this.$forceUpdate();
       });
     },
-    changeoptions() {},
+    changeoptions() { },
     // 且或
     changetriggerLogicsname(e, index) {
       this.updata.triggerConditionList[index].triggerLogic = e;
@@ -766,13 +656,11 @@ export default {
       });
     },
     back() {
-      this.$store
+      this.$store.dispatch("tagsView/delView", this.$route).then(({ visitedViews }) => {
-        .dispatch("tagsView/delView", this.$route)
+        this.$router.push({
-        .then(({ visitedViews }) => {
+          path: "/specialdisease/specialDiseaseRoute",
-          this.$router.push({
-            path: "/specialdisease/specialDiseaseRoute",
-          });
         });
+      });
     },
   },
 };
@@ -793,6 +681,7 @@ export default {
   //   left: 2%;
   top: -75%;
 }
+
 // }
 .icon {
   //   right: -20px;
@@ -808,6 +697,7 @@ export default {
 
   //   }
 }
+
 .container {
   padding: 20px;
   overflow-y: scroll;

src/views/system/specialDiseaseRoute/index.vue

@@ -395,17 +395,18 @@ export default {
       //   this.open = true;
       //   this.title = "修改专病路径信息";
       // });
-      this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+      // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
-        this.$router.push({
+      this.$router.push({
-          path: "/specialdisease/editorialSpecialization",
+        path: "/specialdisease/editorialSpecialization",
-          query: {
+        query: {
-            id: row.id,
+          path: "/specialdisease/specialDiseaseRoute",
-            diseaseTypeName: row.diseaseTypeName,
+          id: row.id,
-            version: row.version,
+          diseaseTypeName: row.diseaseTypeName,
-            routeName: row.routeName,
+          version: row.version,
-          }
+          routeName: row.routeName,
-        });
+        }
-      })
+      });
+      // })
     },
     /** 提交按钮 */
     submitForm() {

src/views/system/taskExecuteRecord/index.vue

@@ -330,6 +330,7 @@ export default {
       this.$router.push({
         path: "/task/record",
         query: {
+          path: "/task/taskExecuteRecord",
           patientId: row.id,
           manageRouteNodeId: row.manageRouteNodeId,
           taskContent: row.taskContent,