xiaochan 1 tahun lalu
induk
melakukan
cee2650fe0

+ 5 - 26
src/App.vue

@@ -175,31 +175,6 @@ function getWindowSize() {
 </script>
 
 <style lang="scss">
-::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-
-  &:hover {
-    cursor: pointer;
-  }
-
-}
-
-::-webkit-scrollbar-thumb {
-  border-radius: 4px;
-  background: rgba(144, 147, 153, .3);
-
-  &:hover {
-    cursor: pointer;
-  }
-}
-
-::-webkit-scrollbar-button {
-  width: 0;
-  height: 0;
-  display: none;
-}
-
 html,
 body,
 #app {
@@ -208,6 +183,10 @@ body,
   margin: 0;
   padding: 0;
   background-color: #f5f5f5;
+
+  div {
+    box-sizing: border-box;
+  }
 }
 
 .max_dialog_body {
@@ -515,7 +494,7 @@ input[type=number]::-webkit-outer-spin-button {
 
   &.padding_zero {
     .el-tabs__content {
-      padding: 0px;
+      padding: 0;
     }
   }
 

+ 16 - 0
src/components/cy/container/src/CyContainer.tsx

@@ -0,0 +1,16 @@
+import {defineComponent} from 'vue'
+
+const CyContainer = defineComponent({
+    name: 'CyContainer',
+    setup() {
+        return () => {
+            return (
+                <div>
+
+                </div>
+            )
+        }
+    }
+})
+
+export default CyContainer

+ 33 - 0
src/components/cy/tree-input/CyTreeInputTest.vue

@@ -0,0 +1,33 @@
+<template>
+  <CyTreeInput width="220px" :tree-ref="treeRef">
+    <template #default="{handelFilter}">
+      <el-tree ref="treeRef"
+               :data="jc"
+               :filter-node-method="handelFilter">
+
+      </el-tree>
+    </template>
+
+  </CyTreeInput>
+</template>
+
+<script setup lang="ts">
+import CyTreeInput from "@/components/cy/tree-input/src/CyTreeInput.vue";
+import {ElTree} from "element-plus";
+import {getJyJcZdTree} from "@/api/zhu-yuan-yi-sheng/jian-yan-jian-cha-shen-qing";
+
+const treeRef = ref()
+
+const jc = ref([])
+
+onMounted(() => {
+  getJyJcZdTree().then(res => {
+    console.log(res)
+    jc.value = res.jc
+  })
+})
+</script>
+
+<style scoped>
+
+</style>

+ 100 - 0
src/components/cy/tree-input/src/CyTreeInput.vue

@@ -0,0 +1,100 @@
+<template>
+  <div :style="style">
+    <div>
+      <el-input v-model="inputValue" @input="handelInput">
+        <template #append>
+          <el-button icon="RefreshLeft" @click="refreshClick">刷新</el-button>
+        </template>
+      </el-input>
+    </div>
+    <div style="flex: 1; height: 0; overflow: auto">
+      <slot :data="tempData" :handelFilter="handelFilter"/>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed, ref, PropType} from 'vue'
+import XEUtils from "xe-utils";
+import {ElInput, ElButton} from "element-plus";
+
+const props = defineProps({
+  width: {
+    type: [String, Number],
+    default: '100%'
+  },
+  height: {
+    type: [String, Number],
+    default: '100%'
+  },
+  remoteMethod: {
+    type: Function as PropType<Promise<any> | null>,
+    default: null
+  },
+  data: {
+    type: [Array],
+    default: null
+  },
+  treeRef: {
+    type: [Object],
+    required: true
+  }
+})
+
+const emits = defineEmits(['update:data'])
+
+const inputValue = ref('')
+const treeData = ref([])
+const slots = useSlots()
+const treeRef = ref()
+
+const tempData = computed({
+  get() {
+    return props.data === null ? treeData.value : props.data
+  },
+  set(val: any[]) {
+    if (props.data === null) {
+      treeData.value = val
+    } else {
+      emits('update:data', val)
+    }
+  }
+})
+
+
+function refreshClick() {
+  if (props.remoteMethod === null) {
+    return
+  }
+  // @ts-ignore
+  (props!.remoteMethod() as Promise<any>).then(res => {
+    tempData.value = res
+  })
+}
+
+function handelInput(val) {
+  props.treeRef!.filter(val)
+}
+
+function handelFilter(val, data) {
+  return data.name.include(val)
+}
+
+const style = computed(() => {
+  return {
+    width: XEUtils.addUnit(props.width),
+    height: XEUtils.addUnit(props.height),
+    display: 'flex',
+    flexFlow: 'column nowrap'
+  }
+})
+
+
+onMounted(() => {
+  console.log(slots)
+})
+</script>
+
+<style>
+
+</style>

+ 0 - 22
src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/YiZhuLuRu.vue

@@ -20,12 +20,6 @@
       </template>
     </CyFlex>
 
-
-    <doctor-s-order-fee :data="chargeDetails.data"
-                        v-if="chargeDetails.dialog"
-                        :sum="chargeDetails.sum"
-                        @close="chargeDetails.dialog = false"/>
-
     <!--  获取模板的数据  -->
     <huo-qu-mu-ban
         ref="mubanRef"
@@ -75,7 +69,6 @@ import {applicationForRevocation} from "@/api/zhu-yuan-yi-sheng/qrder-quash";
 import XEUtils from 'xe-utils'
 import {nextTick, onActivated, onMounted, ref} from 'vue'
 import {CyMessageBox} from "@/components/cy/message-box";
-import DoctorSOrderFee from "@/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/DoctorSOrderFee.vue";
 import YzTableV3 from "@/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/components/table/YzTableV3.vue";
 import CyFlex from "@/components/cy/flex/src/CyFlex.vue";
 import doctorStore, {YzSidebarEnum} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/useDoctorStore";
@@ -199,21 +192,6 @@ const voidOrdersClick = (val) => {
   orderQuash(val)
 }
 
-/**
- * 右键点击查看医嘱产生的费用
- * @param val
- */
-const doctorSOrderFee = ref({
-  data: {},
-  problem: {},
-  totalCost: {}
-})
-
-const chargeDetails = ref({
-  dialog: false,
-  data: [],
-  sum: {}
-})
 
 // 获取模板
 const mubanRef = ref(null)

+ 0 - 6
src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/components/FeeTable.vue

@@ -37,12 +37,6 @@ const filterRoleMethod = ({value, row}) => {
   }
 }
 
-const tableCheckboxConfig = ref({
-  checkMethod: ({row}) => {
-    return row.oriDetailSn === 0
-  }
-})
-
 const filters = [{label: '未退', value: 1}, {label: '退费', value: 2}, {label: '被退', value: 3}]