style(flowable): 优化流程相关代码的import顺序和代码结构

openhis-ui-vue3/src/views/pharmacymanagement/dispensingOrder/components/medicineList.vue

@@ -16,9 +16,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/dispensingOrder/components/orderTable.vue

@@ -350,11 +350,11 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo, getMedicineList } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo, getMedicineList} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 // 获取当前实例
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/views/pharmacymanagement/dispensingOrder/index.vue

@@ -197,18 +197,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref, watch} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/profitLossOrder/components/medicineList.vue

@@ -18,9 +18,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/profitLossOrder/components/orderDialog.vue

@@ -62,9 +62,9 @@
 </template>
 
 <script setup>
-import { getPurchaseOrderList, getPurchaseOrderDetail } from './api';
-import { ref, watch, getCurrentInstance } from 'vue';
-import { parseTime } from '@/utils/his';
+import {getPurchaseOrderDetail, getPurchaseOrderList} from './api';
+import {getCurrentInstance, ref, watch} from 'vue';
+import {parseTime} from '@/utils/his';
 // 调用父组件方法
 const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
 // 获取当前实例

openhis-ui-vue3/src/views/pharmacymanagement/profitLossOrder/components/orderTable.vue

@@ -520,12 +520,12 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo, getMedicineList } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import orderDialog from './orderDialog.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 
 // 获取当前实例

openhis-ui-vue3/src/views/pharmacymanagement/profitLossOrder/index.vue

@@ -205,18 +205,12 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/requisitionOrder/components/medicineList.vue

@@ -16,9 +16,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/requisitionOrder/components/orderTable.vue

@@ -352,11 +352,11 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo, getMedicineList } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo, getMedicineList} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 // 获取当前实例
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/views/pharmacymanagement/requisitionOrder/index.vue

@@ -197,18 +197,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref, watch} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/returnToDispensaryOrder/components/medicineList.vue

@@ -16,9 +16,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/returnToDispensaryOrder/components/orderTable.vue

@@ -346,11 +346,11 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo, getMedicineList } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo, getMedicineList} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 // 获取当前实例
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/views/pharmacymanagement/returnToDispensaryOrder/index.vue

@@ -197,18 +197,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref, watch} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/stockInOrder/components/medicineList.vue

@@ -16,9 +16,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/stockInOrder/components/orderTable.vue

@@ -346,11 +346,11 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo, getMedicineList } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo, getMedicineList} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 // 获取当前实例
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/views/pharmacymanagement/stockInOrder/index.vue

@@ -197,18 +197,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref, watch} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/stocktakingOrder/components/medicineList.vue

@@ -18,9 +18,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/stocktakingOrder/components/orderDialog.vue

@@ -62,9 +62,9 @@
 </template>
 
 <script setup>
-import { getPurchaseOrderList, getPurchaseOrderDetail } from './api';
-import { ref, watch, getCurrentInstance } from 'vue';
-import { parseTime } from '@/utils/his';
+import {getPurchaseOrderDetail, getPurchaseOrderList} from './api';
+import {getCurrentInstance, ref, watch} from 'vue';
+import {parseTime} from '@/utils/his';
 // 调用父组件方法
 const emit = defineEmits(['dialogSubmit', 'dialogCancel', 'updateTableData']);
 // 获取当前实例

openhis-ui-vue3/src/views/pharmacymanagement/stocktakingOrder/components/orderTable.vue

@@ -580,12 +580,12 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import orderDialog from './orderDialog.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 
 // 获取当前实例

openhis-ui-vue3/src/views/pharmacymanagement/stocktakingOrder/index.vue

@@ -205,18 +205,12 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/transferInOrder/components/medicineList.vue

@@ -16,9 +16,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/transferInOrder/components/orderTable.vue

@@ -425,11 +425,11 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo, getMedicineList } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo, getMedicineList} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 // 获取当前实例
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/views/pharmacymanagement/transferInOrder/index.vue

@@ -197,18 +197,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref, watch} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/transferOutOrder/components/medicineList.vue

@@ -16,9 +16,9 @@
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getMedicineList} from './api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/pharmacymanagement/transferOutOrder/components/orderTable.vue

@@ -425,11 +425,11 @@
 </template>
 
 <script setup>
-import { addOrEditOrder, getBusNo, getMedicineList } from './api';
-import { nextTick, ref, watch } from 'vue';
+import {addOrEditOrder, getBusNo, getMedicineList} from './api';
+import {nextTick, ref, watch} from 'vue';
 import medicineList from './medicineList.vue';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 // 获取当前实例
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/views/pharmacymanagement/transferOutOrder/index.vue

@@ -197,18 +197,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import {ref, watch} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
 import orderTable from './components/orderTable.vue';
-import {
-  getInit,
-  getOrderList,
-  deleteOrder,
-  agreeApproval,
-  getOrderDetail,
-} from './components/api';
+import {agreeApproval, deleteOrder, getInit, getOrderDetail, getOrderList,} from './components/api';
 import useUserStore from '@/store/modules/user';
-import { parseTime } from '@/utils/his';
+import {parseTime} from '@/utils/his';
 
 const route = useRoute();
 const router = useRouter();

openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue

@@ -442,32 +442,28 @@
 </template>
 
 <script setup name="westernmedicine">
-import {ref, computed, onMounted, onBeforeMount, nextTick} from 'vue';
+import {onMounted, ref} from 'vue';
 import {ElMessage} from 'element-plus';
 import {
-  listWesternmedicine,
-  listPatient,
-  updateMedicion,
-  listInit,
-  backMedicion,
-  prepareMedicion,
-  itemTraceNo,
-  getReportRegisterInit,
   deviceDispense,
-  deviceInvalid,
   devicePatientList,
-  medicineMatch,
   getDoctorSignature,
+  getReportRegisterInit,
+  itemTraceNo,
+  listInit,
+  listPatient,
+  listWesternmedicine,
+  prepareMedicion,
+  updateMedicion,
 } from './components/api';
 import {advicePrint, getAdjustPriceSwitchState, lotNumberMatch} from '@/api/public';
-import {formatDate, formatDateStr} from '@/utils/index';
+import {formatDate} from '@/utils/index';
 import {debounce} from 'lodash-es';
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 import {hiprint} from 'vue-plugin-hiprint';
 // import templateJson from './components/templateJson.json';
 import templateJson from '@/components/Print/Pharmacy.json';
 import chineseMedicineTemplateJson from '@/components/Print/ChineseMedicinePrescription.json';
-import disposalTemplate from './components/disposalTemplate.json';
 import {formatInventory} from '../../../utils/his';
 
 const {proxy} = getCurrentInstance();