diff --git a/src/components/report/TurnoverReportM.vue b/src/components/report/TurnoverReportM.vue
index 09c071a..3d0511a 100644
--- a/src/components/report/TurnoverReportM.vue
+++ b/src/components/report/TurnoverReportM.vue
@@ -95,31 +95,7 @@ export default {
},
tableData: [],
- pickerOptions: {
- disabledDate(time) {
- return time.getTime() > Date.now();
- },
- shortcuts: [{
- text: '今天',
- onClick(picker) {
- picker.$emit('pick', new Date());
- }
- }, {
- text: '昨天',
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24);
- picker.$emit('pick', date);
- }
- }, {
- text: '一周前',
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit('pick', date);
- }
- }]
- },
+
};
},
@@ -142,7 +118,7 @@ export default {
},
computed: {
- ...mapState(["window", "dict", "patientRegister", "report"]),
+ ...mapState(["pickerOptions","window", "dict", "patientRegister", "report"]),
},
methods: {
//获取初始数据
diff --git a/src/components/report/TurnoverReportP.vue b/src/components/report/TurnoverReportP.vue
index 58319b0..077ff14 100644
--- a/src/components/report/TurnoverReportP.vue
+++ b/src/components/report/TurnoverReportP.vue
@@ -94,33 +94,7 @@ export default {
isPreRegistration:'N'
},
tableData: [],
-
- pickerOptions: {
- disabledDate(time) {
- return time.getTime() > Date.now();
- },
- shortcuts: [{
- text: '今天',
- onClick(picker) {
- picker.$emit('pick', new Date());
- }
- }, {
- text: '昨天',
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24);
- picker.$emit('pick', date);
- }
- }, {
- text: '一周前',
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit('pick', date);
- }
- }]
- },
-
+
};
},
@@ -142,7 +116,7 @@ export default {
},
computed: {
- ...mapState(["window", "dict", "patientRegister", "report"]),
+ ...mapState(["pickerOptions","window", "dict", "patientRegister", "report"]),
},
methods: {
//获取初始数据
diff --git a/src/components/report/TurnoverReportS.vue b/src/components/report/TurnoverReportS.vue
index 3e748ab..c5bab9a 100644
--- a/src/components/report/TurnoverReportS.vue
+++ b/src/components/report/TurnoverReportS.vue
@@ -106,35 +106,7 @@ export default {
tableData: [],
- pickerOptions: {
- disabledDate(time) {
- return time.getTime() > Date.now();
- },
- shortcuts: [
- {
- text: "今天",
- onClick(picker) {
- picker.$emit("pick", new Date());
- },
- },
- {
- text: "昨天",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24);
- picker.$emit("pick", date);
- },
- },
- {
- text: "一周前",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit("pick", date);
- },
- },
- ],
- },
+
};
},
@@ -152,7 +124,7 @@ export default {
},
computed: {
- ...mapState(["window", "dict", "patientRegister", "report"]),
+ ...mapState(["pickerOptions","window", "dict", "patientRegister", "report"]),
},
methods: {
//获取初始数据
diff --git a/src/views/charge/invoiceReg.vue b/src/views/charge/invoiceReg.vue
index dc8e2c9..00ecdd3 100644
--- a/src/views/charge/invoiceReg.vue
+++ b/src/views/charge/invoiceReg.vue
@@ -25,10 +25,10 @@