1. 更新分包,现在主包超过了2m

This commit is contained in:
李琦
2026-06-01 13:24:36 +08:00
parent d89f3a1658
commit a515ed3d37
31 changed files with 42 additions and 39 deletions

View File

@@ -1,6 +1,6 @@
import $store from '@/store/index.js'; import $store from '@/store/index.js';
import pinyin from './getPingYin.js'; // import pinyin from './getPingYin.js';
class utils { class utils {
constructor(arg) { constructor(arg) {

View File

@@ -48,31 +48,6 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path": "pages/my/prescriptionList",
"style": {
"navigationBarTitleText": "我的处方"
}
},
{
"path": "pages/workbench/prescriptionList",
"style": {
"navigationBarTitleText": "待流转处方"
}
},
{
"path": "pages/workbench/prescriptionDetail",
"style": {
"navigationBarTitleText": "处方详情"
}
},
{
"path": "pages/my/prescriptionDetail",
"style": {
"navigationBarTitleText": "处方详情"
}
},
{ {
"path": "pages/pharmacist/index", "path": "pages/pharmacist/index",
"style": { "style": {
@@ -228,6 +203,18 @@
"navigationBarTitleText": "患者详情" "navigationBarTitleText": "患者详情"
} }
},
{
"path": "prescriptionList",
"style": {
"navigationBarTitleText": "待流转处方"
}
},
{
"path": "prescriptionDetail",
"style": {
"navigationBarTitleText": "处方详情"
}
} }
] ]
}, },
@@ -321,6 +308,18 @@
"navigationBarTitleText": "常用医嘱管理" "navigationBarTitleText": "常用医嘱管理"
} }
},
{
"path": "prescriptionList",
"style": {
"navigationBarTitleText": "我的处方"
}
},
{
"path": "prescriptionDetail",
"style": {
"navigationBarTitleText": "处方详情"
}
} }
] ]
}, },

View File

@@ -94,7 +94,7 @@
// }, { // }, {
name: '我的处方', name: '我的处方',
icon: '../../static/image/wd-cf.png', icon: '../../static/image/wd-cf.png',
url: '/pages/my/prescriptionList' url: '/subPackages/sub_my/prescriptionList'
}, },
{ {
name: '我的常用方', name: '我的常用方',

View File

@@ -260,7 +260,7 @@
<!-- 处方 --> <!-- 处方 -->
<view v-if="noticeList.length" class="news_item flex-row flex-jus-sp flex-ali-center" <view v-if="noticeList.length" class="news_item flex-row flex-jus-sp flex-ali-center"
@click="$go('./prescriptionList')"> @click="$go('/subPackages/sub_workbench/prescriptionList')">
<view style="width: 80rpx;position: relative;"> <view style="width: 80rpx;position: relative;">
<u-image width="80rpx" height="80rpx" shape="circle" src="/static/image/home1.png"> <u-image width="80rpx" height="80rpx" shape="circle" src="/static/image/home1.png">
<u-loading slot="loading"></u-loading> <u-loading slot="loading"></u-loading>

View File

@@ -1,6 +1,5 @@
import Vue from 'vue' import Vue from 'vue'
import Vuex from 'vuex' import Vuex from 'vuex'
import Utils from '@/common/utils.js';
import { disconnectWebSocket } from '@/utils/ws/initWebSocket.js'; import { disconnectWebSocket } from '@/utils/ws/initWebSocket.js';
import { import {

View File

@@ -10,10 +10,10 @@
<view class="p-row-2 m-t-2"> <view class="p-row-2 m-t-2">
<block v-if="!loading && list.length > 0"> <block v-if="!loading && list.length > 0">
<view class="p-32 b-r-8 white m-b-2" v-for="(item, i) in list" :key="item.id" <view class="p-32 b-r-8 white m-b-2" v-for="(item, i) in list" :key="item.id"
@click="$go('/pages/my/prescriptionDetail?id=' +item.id)"> @click="$go('/subPackages/sub_my/prescriptionDetail?id=' +item.id)">
<view class="flex-row flex-ali-center flex-jus-sp m-t-2"> <view class="flex-row flex-ali-center flex-jus-sp m-t-2">
<u-icon margin-left="8" label-size="32" label-color="#6C7380" <u-icon margin-left="8" label-size="32" label-color="#6C7380"
:name="require('../../static/image/ys.png')" :label="item.prescription_no" :name="require('@/static/image/ys.png')" :label="item.prescription_no"
color="#6ACDBB" size="32"></u-icon> color="#6ACDBB" size="32"></u-icon>
<d-text :text="statusName[item.status]"></d-text> <d-text :text="statusName[item.status]"></d-text>
</view> </view>

View File

@@ -853,7 +853,7 @@ export default {
const rx = this.ordersRxList.find((r) => r._wxKey === wxKey); const rx = this.ordersRxList.find((r) => r._wxKey === wxKey);
const id = rx && (rx.id || rx.prescription_id); const id = rx && (rx.id || rx.prescription_id);
if (!id) return; if (!id) return;
let url = `/pages/my/prescriptionDetail?id=${id}`; let url = `/subPackages/sub_my/prescriptionDetail?id=${id}`;
const no = rx.order_no || rx.prescription_no; const no = rx.order_no || rx.prescription_no;
if (no) url += `&no=${encodeURIComponent(no)}`; if (no) url += `&no=${encodeURIComponent(no)}`;
this.ordersPopupOpen = false; this.ordersPopupOpen = false;
@@ -1224,7 +1224,7 @@ export default {
viewPrescription(content) { viewPrescription(content) {
const id = content && content.id; const id = content && content.id;
if (id) { if (id) {
uni.navigateTo({ url: `/pages/my/prescriptionDetail?id=${id}` }); uni.navigateTo({ url: `/subPackages/sub_my/prescriptionDetail?id=${id}` });
} }
}, },
onBubbleViewPrescription(idOrContent, orderNo) { onBubbleViewPrescription(idOrContent, orderNo) {
@@ -1234,7 +1234,7 @@ export default {
} }
const id = idOrContent; const id = idOrContent;
if (id) { if (id) {
let url = `/pages/my/prescriptionDetail?id=${id}`; let url = `/subPackages/sub_my/prescriptionDetail?id=${id}`;
if (orderNo) url += `&no=${encodeURIComponent(orderNo)}`; if (orderNo) url += `&no=${encodeURIComponent(orderNo)}`;
uni.navigateTo({ url }); uni.navigateTo({ url });
} }

View File

@@ -221,7 +221,7 @@
} }
this.$go('../../subPackages/sub_workbench/workbench_infoPatient?id=' + patient_id + '&re_id=' + id) this.$go('../../subPackages/sub_workbench/workbench_infoPatient?id=' + patient_id + '&re_id=' + id)
} else if (base_type == 5 && id) { } else if (base_type == 5 && id) {
this.$go('/pages/my/prescriptionDetail?id=' + id) this.$go('/subPackages/sub_my/prescriptionDetail?id=' + id)
} }
}, },
patientInfo() { patientInfo() {

View File

@@ -120,7 +120,7 @@
const re_id = e.split(',').slice(1, 2) const re_id = e.split(',').slice(1, 2)
this.$go('../../subPackages/sub_workbench/workbench_infoPatient?id=' + id + '&re_id=' + re_id) this.$go('../../subPackages/sub_workbench/workbench_infoPatient?id=' + id + '&re_id=' + re_id)
} else if (base_type == 5 && e) { } else if (base_type == 5 && e) {
this.$go('/pages/my/prescriptionDetail?id=' + e) this.$go('/subPackages/sub_my/prescriptionDetail?id=' + e)
} }
}, },
}, },

View File

@@ -4,10 +4,10 @@
<view class="p-row-2 m-t-2"> <view class="p-row-2 m-t-2">
<block v-if="list.length > 0"> <block v-if="list.length > 0">
<view class="p-32 b-r-8 white m-b-2 item" v-for="(item, i) in list" :key="item.id" <view class="p-32 b-r-8 white m-b-2 item" v-for="(item, i) in list" :key="item.id"
@click="$go('./prescriptionDetail?id=' +item.data + '&notice_id=' + item.id)"> @click="$go('/subPackages/sub_workbench/prescriptionDetail?id=' +item.data + '&notice_id=' + item.id)">
<view class="flex-row flex-ali-center flex-jus-sp m-t-2"> <view class="flex-row flex-ali-center flex-jus-sp m-t-2">
<u-icon margin-left="8" label-size="32" label-color="#6C7380" <u-icon margin-left="8" label-size="32" label-color="#6C7380"
:name="require('../../static/image/ys.png')" :label="item.content" :name="require('@/static/image/ys.png')" :label="item.content"
color="#6ACDBB" size="32"></u-icon> color="#6ACDBB" size="32"></u-icon>
<!-- <d-text :text="statusName[item.status]"></d-text> --> <!-- <d-text :text="statusName[item.status]"></d-text> -->
</view> </view>

View File

@@ -16,7 +16,12 @@
</template> </template>
<script> <script>
import LPainter from './uni_modules/lime-painter/components/l-painter/l-painter.vue'
export default { export default {
components: {
'l-painter': LPainter
},
data() { data() {
return { return {
poster: { poster: {

View File

@@ -312,7 +312,7 @@ export default {
return item && item.register_id ? item.register_id : '' return item && item.register_id ? item.register_id : ''
}, },
openPrescriptionDetail(prescriptionId) { openPrescriptionDetail(prescriptionId) {
this.$go('/pages/my/prescriptionDetail?id=' + prescriptionId) this.$go('/subPackages/sub_my/prescriptionDetail?id=' + prescriptionId)
}, },
withdrawRxByIndex(which, index) { withdrawRxByIndex(which, index) {
const list = which === 'current' ? this.rxCurrentList : this.rxHistoryList const list = which === 'current' ? this.rxCurrentList : this.rxHistoryList