Merge branch 'dev-20210715' into 'release'

Dev 20210715, code review:bo.dang

See merge request !29

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -176,9 +176,7 @@
           <el-col :span="24" class="btn-wrap">
             <el-button type="success" class="submit-btn big-btn" @click="batchSetOperator" v-if="searchParam.menuType == 1"
               >批量设置运营</el-button>
-            <el-button type="info" class="submit-btn" @click="download"
-              >全部导出</el-button
-            >
+            <el-button type="info" class="submit-btn" @click="download" v-if="fromType != 5">全部导出</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -238,6 +236,7 @@
 <script>
 let vm = null;
 import {updateDiagnosis} from "../../../utils/diagnosis";
+import { base64decode } from "../../../utils/utils.js";
 const DOWN_URL= '/diagnose/admin/diagnose/export';
 const LIST_URL= '/diagnose/admin/diagnose/list';
 const DEP_URL= '/hospital/departments/0'
@@ -368,7 +367,16 @@ export default {
   },
   methods: {
     init(){
-      this.fromType = +(this.$route.query.fromType || 1);
+      let fullPath = this.$route.fullPath;
+      let fromType = 1;
+      if(fullPath.indexOf("?") > -1){
+        let str = base64decode(fullPath.split("?")[1]);
+        if(str.indexOf("?")){
+          fromType = str.split("=")[1];
+        }
+      }
+      // this.fromType = +(this.$route.query.fromType || 1);
+      this.fromType = fromType;
       this.activeName =  "99";
       this.searchParam.status = '';
       this.setTable();