Merge remote-tracking branch 'upstream/master'

index.html

@@ -8,8 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
     <script type="text/javascript"
-            src="http://api.map.baidu.com/api?v=2.0&ak=rQxHPQX1ua21rWnXzTbUh5KSSUbnefxR"></script>
-    <script src="/src/baidu_mapv"></script>
+            src="https://api.map.baidu.com/api?v=2.0&ak=rQxHPQX1ua21rWnXzTbUh5KSSUbnefxR"></script>
+    <script src="https://mapv.baidu.com/build/mapv.min.js"></script>
+
 
     <title></title>
 </head>

src/router/modules/dashboard.js

@@ -14,6 +14,11 @@ const route = [
         hideMenu: true,
         meta: {title: '候诊信息', hideTabs: true},
     },
+    {
+        path: '/siSettleDetailList/:patientId?/:times?',
+        component: createNameComponent(() => import('@/views/medical-insurance/allpatient/SiSettleDetailList.vue')),
+        meta: {title: '医保结算单', icon: 'iconfont icon-zhuyuanqingdan', passRule: true},
+    },
     {
         path: '/',
         component: Layout,

src/views/medical-insurance/allpatient/SiSettleDetailList.vue

@@ -46,7 +46,7 @@
         <a href="http://webhis.thyy.cn:8888/LODOP/Lodop.zip">下载打印控件</a>
       </div>
     </div>
-    <div v-else style="position: fixed; top: 20px; left: 20px">
+    <div v-else style="position: fixed; top: 6px; right: 30px">
       <el-button type="danger" icon="Printer" @click="siPrint">打印</el-button>
     </div>
   </div>

src/views/reports/InpatientAddrAnalyze.vue

@@ -10,8 +10,8 @@
             <el-option :value="1" label="住院"/>
             <el-option :value="2" label="门诊"/>
           </el-select>
-
           <el-date-picker
+              :disabled="!(patientType === 1 && inHospital=== 2)"
               v-model="dateRange"
               :shortcuts="shortcuts"
               end-placeholder="结束日期"
@@ -21,7 +21,7 @@
               style="width: 220px;top:3px"
               type="daterange"/>
 
-          <el-select style="width: 60px" v-model="inHospital">
+          <el-select style="width: 60px" v-model="inHospital" :disabled="patientType === 2">
             <el-option :value="1" label="在院"/>
             <el-option :value="2" label="出院"/>
           </el-select>
@@ -190,6 +190,7 @@ onMounted(() => {
 
 })
 
+
 </script>
 
 <style scoped lang="scss">