dev

src/components/settings/ItemEdit.vue

@@ -59,14 +59,14 @@
       </div>
     </template>
   </Mask>
-  <Search ref="createSearchRef" @confirm="createConfirm"/>
+  <ItemSearch ref="createSearchRef" @confirm="createConfirm"/>
 </template>
 <script setup lang="ts">
 import {defineProps, defineEmits, ref, nextTick, onMounted} from 'vue'
 import {post} from "@/utils/request.ts";
-import Search from "./Search.vue";
 import {ElMessage} from "element-plus";
 import Mask from "@/components/common/Mask.vue";
+import ItemSearch from "@/components/settings/ItemSearch.vue";
 
 const props = defineProps({
   id: {
@@ -140,7 +140,7 @@ const createConfirm = (data: any) => {
   console.log(data, 'data')
   form.value = data
   form.value.itemName = data.name
-  form.value.itemSocialCode = data.hilistCode
+  form.value.itemSocialCode = data.code
 }
 const deleteDetail = () => {
   post("item/delete", {id: props.id}).then((res: any) => {

src/components/statistics/over/ChargeDetail.vue

@@ -3,7 +3,7 @@
     <div class="content">
       <div class="title">
         <el-date-picker
-            v-model="value2"
+            v-model="date"
             type="daterange"
             range-separator="~"
             start-placeholder="开始日期"
@@ -64,200 +64,67 @@
       </div>
       <div class="content-box">
         <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="name" label="收费时间" align="center"/>
+          <el-table-column prop="chargeTime" label="收费时间" align="center" show-overflow-tooltip/>
-          <el-table-column label="销售单号" align="center"></el-table-column>
+          <el-table-column label="销售单号" prop="projectCode" show-overflow-tooltip></el-table-column>
-          <el-table-column label="患者姓名" align="center"></el-table-column>
+          <el-table-column label="患者姓名" prop="customer"></el-table-column>
-          <el-table-column prop="name" label="性别" align="center"/>
+          <el-table-column prop="source" label="开单来源" />
-          <el-table-column prop="zip" label="年龄" align="center"></el-table-column>
+          <el-table-column prop="type" label="收费/退费" align="center"></el-table-column>
-          <el-table-column label="手机号" align="center"></el-table-column>
+          <el-table-column prop="originalPrice" label="原价" align="center"></el-table-column>
-          <el-table-column prop="name" label="开单来源" align="center"/>
+          <el-table-column prop="discount" label="优惠" align="center"></el-table-column>
-          <el-table-column prop="zip" label="患者等级" align="center"></el-table-column>
+          <el-table-column prop="receivable" label="应收" align="center"></el-table-column>
-          <el-table-column prop="zip" label="顾客来源" align="center"></el-table-column>
+
-          <el-table-column prop="zip" label="类型" align="center"></el-table-column>
+          <el-table-column prop="netReceipts" label="实收" align="center"></el-table-column>
-          <el-table-column prop="zip" label="原价" align="center"></el-table-column>
+          <el-table-column prop="payType" label="支付类型" align="center"></el-table-column>
-          <el-table-column prop="zip" label="单项改价" align="center"></el-table-column>
+          <el-table-column label="销售人" prop="salePersonId"></el-table-column>
-          <el-table-column label="优惠" align="center"></el-table-column>
-          <el-table-column label="整单改价" align="center"></el-table-column>
-          <el-table-column label="应收" align="center"></el-table-column>
-          <el-table-column label="实收" align="center"></el-table-column>
         </el-table>
       </div>
     </div>
   </div>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
+import {onMounted, ref} from 'vue'
-const tableData = [
+import {post} from "@/utils/request.ts";
-  {
+const tableData = ref<any[]>([])
-    date: '2016-05-03',
+const date = ref<any>([])
-    name: 'Tom',
+const salesPerson = ref<any>('')
-    state: 'California',
+const salesPersonOptions = [{}
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  }
 ]
-const value2 = ref([])
+const type = ref<any>('')
-const shortcuts = [
+const typeOptions = [{
-  {
-    text: '今天',
-    value() {
-      const end = new Date()
-      const start = new Date()
-      return [start, end]
-    },
-  },
-  {
-    text: '昨天',
-    value() {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 1)
-      return [start, end]
-    }
-  },
-  {
-    text: '本周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '上个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '前三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
-const options = [
-  {
-    value: '选项1',
-    label: '黄金糕',
-  },
-  {
-    value: '选项2',
-    label: '双皮奶',
-  },
-  {
-    value: '选项3',
-    label: '蚵仔煎',
-  },
-  {
-    value: '选项4',
-    label: '龙须面',
-  },
-  {
-    value: '选项5',
-    label: '北京烤鸭',
-  },
-]
-const value = ref('')
-const salesPerson = ref('')
-const salesPersonOptions = [
-  {
   value: '1',
-    label: '医保卡',
+  label: '全部'
-  },
+}
-  {
-    value: '2',
-    label: '微信',
-  },
-  {
-    value: '3',
-    label: '支付宝',
-  },
-  {
-    value: '4',
-    label: '现金',
-  },
-  {
-    value: '5',
-    label: '其他',
-  },
 ]
-const type = ref('')
+const source = ref<any>('')
-const typeOptions = [
+const sourceOptions = [{
-  {
   value: '1',
-    label: '中西成药',
+  label: '全部'
-  },
+}
-  {
-    value: '2',
-    label: '中药饮片',
-  },
-  {
-    value: '3',
-    label: '医疗器械',
-  },
-  {
-    value: '4',
-    label: '其他商品',
-  }
 ]
-const source = ref('')
-const sourceOptions = [
-  {
-    value: '1',
-    label: '门诊',
-  },
-  {
-    value: '2',
-    label: '住院',
-  },
-  {
-    value: '3',
-    label: '体检',
 
-  }
+const chargeMan = ref<any>('')
-]
+const chargeManOptions = [{
-const chargeMan = ref('')
-const chargeManOptions = [
-  {
   value: '1',
-    label: '张三',
+  label: '全部'
-  },
+}
-  {
-    value: '2',
-    label: '李四',
-  },
-  {
-    value: '3',
-    label: '王五',
-  },
-  {
-    value: '4',
-    label: '赵六',
-  }
 ]
-const pay = ref('')
+
-const payOptions = [
+const pay = ref<any>('')
-  {
+const payOptions = [{
   value: '1',
-    label: '现金',
+  label: '全部'
-  },
+}
-  {
-    value: '2',
-    label: '微信',
-  },
-  {
-    value: '3',
-  }
 ]
+
+const getDate = () => {
+  post("charge/getChargeRecord").then((res:any)=>{
+    tableData.value = res.list
+  })
+}
+
+onMounted(()=>{
+  getDate();
+})
 </script>
 <style scoped lang="scss">
 .title{

src/views/statistics/overView.vue

@@ -17,9 +17,6 @@
     <el-tab-pane label="收费明细" name="fourth">
       <ChargeDetail></ChargeDetail>
     </el-tab-pane>
-    <el-tab-pane label="收费分类统计" name="fifth">
-      <Retail></Retail>
-    </el-tab-pane>
   </el-tabs>
   </div>
 </template>