diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue index 902ae569..80c5bcdc 100644 --- a/src/views/basic/collectPoint/userWorkplace.vue +++ b/src/views/basic/collectPoint/userWorkplace.vue @@ -402,7 +402,8 @@ export default { this.userQuery = { page: 1, limit: 10, - key: '' + key: '', + deptCode: this.$store.getters.locDeptCode, } this.getUsers() }, diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue index 72bec752..b2189e45 100644 --- a/src/views/collect/CollectOrderNew.vue +++ b/src/views/collect/CollectOrderNew.vue @@ -372,7 +372,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" v-if="downloadPrescriptionVisible" - width="65%" + width="75%" append-to-body > {{ formData.billNo }} - {{ formData.fromCorpName }} + {{ formData.shipperName }} + {{ formData.fromCorpName }} {{ formData.busTypeName }} {{ formData.fromType }} {{ formData.billTime }} diff --git a/src/views/collect/prescribe/prescribeDownloadDialog.vue b/src/views/collect/prescribe/prescribeDownloadDialog.vue index 1c46fb70..0dbf8686 100644 --- a/src/views/collect/prescribe/prescribeDownloadDialog.vue +++ b/src/views/collect/prescribe/prescribeDownloadDialog.vue @@ -111,7 +111,7 @@ + :row-style="{ height: '32px' }" @selection-change="handleUserSelectionChange" @row-click="prescribeClick"> @@ -226,6 +234,7 @@ import {executeFuc, getHead} from "@/utils/customConfig"; import {deleteDataByCode} from "@/api/basic/sicker/prescribeApi"; import {getThrOrderPage} from "@/api/collect/collectOrder"; import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments' +import PannelOriginOrderDetail from "../PannelOriginOrderDetail" export default { name: "prescribeDownloadDialog", @@ -235,6 +244,7 @@ export default { required: true, }, }, + components:{PannelOriginOrderDetail}, data() { return { actDateRange: [], @@ -316,6 +326,8 @@ export default { page: 1, limit: 10, }, + panelALive:false, + curRow: null, } }, methods: { @@ -421,9 +433,15 @@ export default { this.getList(); }, - prescribeClick(_this, row) { - this.getPrescribeDetail(_this, row) - this.getCodeDetail(_this, row) + // prescribeClick(_this, row) { + // this.getPrescribeDetail(_this, row) + // this.getCodeDetail(_this, row) + // _this.curRow = row; + // _this.refreshCodesPanel(_this); + // }, + prescribeClick(row) { + this.curRow = row; + this.refreshCodesPanel(); }, getPrescribeDetail(_this, row) { @@ -487,7 +505,7 @@ export default { .catch(() => { }); }, - getWorkBindBusTypes(_this) { + getWorkBindBusTypes(_this) { getWorkBindBusTypes(this.busQuery).then(res => { if (res.code == 20000) { let busTypes = res.data.list || []; @@ -503,7 +521,12 @@ export default { return }) }, - + refreshCodesPanel() { + this.panelALive = false; + this.$nextTick(() => { + this.panelALive = true; + }); + } }, created() { getHead("prescribePanel-online", "1").then((re) => {