UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修复

Browse Source
20240912_adapter
chenhc 2 months ago
parent d95aa93bec
commit 3a122c087a
2 changed files with 287 additions and 528 deletions
Show Stats Download Patch File Download Diff File

283
src/views/collect/ConfirmDrugDealOrder.vue
Unescape Escape View File

@ -1,11 +1,7 @@
<template>
<div class="page-container">
<div class="content-wrapper">
<!-- 左侧面板 -->
<div class="content-left">
<el-card style=" height: 800px;">
<el-descriptions :title="scanTip" :column="2" border style="margin-top: 15px"></el-descriptions>
<div>
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" @submit.native.prevent>
<el-card>
<!-- <el-alert-->
<!-- style="margin-top: 15px"-->
@ -14,67 +10,67 @@
<!-- type="warning">-->
<!--</el-alert>-->
<!-- <el-row :gutter="0" style="margin-top: 15px">-->
<!-- <el-col :span="24" align="right">-->
<!-- <el-button-group>-->
<!-- &lt;!&ndash; <el-button type="primary" @click.native="deleteCode"&ndash;&gt;-->
<!-- &lt;!&ndash; v-if="labelName == 1"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formData.billNo == null"&ndash;&gt;-->
<!-- &lt;!&ndash; >扫码剔除&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button size="mini" type="primary"&ndash;&gt;-->
<!-- &lt;!&ndash; v-if="labelName == 2"&ndash;&gt;-->
<!-- &lt;!&ndash; @click.native="overdeleteCode"&ndash;&gt;-->
<!-- &lt;!&ndash; >结束剔除&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- :disabled="formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"-->
<!-- @click.native="nextCollectOrder()"-->
<!-- >下一单-->
<el-row :gutter="0" style="margin-top: 15px">
<el-col :span="24" align="right">
<el-button-group>
<!-- <el-button type="primary" @click.native="deleteCode"-->
<!-- v-if="labelName == 1"-->
<!-- :disabled="formData.billNo == null"-->
<!-- >扫码剔除-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary"-->
<!-- v-if="labelName == 2"-->
<!-- @click.native="overdeleteCode"-->
<!-- >结束剔除-->
<!-- </el-button>-->
<el-button
type="primary"
:disabled="formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"
@click.native="nextCollectOrder()"
>下一单
</el-button>
<el-button
type="primary"
:disabled="formData.billNo ||(this.formDataVisible != null && this.formDataVisible.scanType == 1)"
@click.native="selectPrescribe()"
>选单
</el-button>
<!-- <el-button-->
<!-- type="primary"-->
<!-- :disabled="formData.billNo ||(this.formDataVisible != null && this.formDataVisible.scanType == 1)"-->
<!-- @click.native="selectPrescribe()"-->
<!-- >选单-->
<!-- :disabled="!formData.billNo"-->
<!-- @click.native="saveDraftOrder()"-->
<!-- >挂起-->
<!-- </el-button>-->
<!-- &lt;!&ndash; <el-button&ndash;&gt;-->
<!-- &lt;!&ndash; type="primary"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="!formData.billNo"&ndash;&gt;-->
<!-- &lt;!&ndash; @click.native="saveDraftOrder()"&ndash;&gt;-->
<!-- &lt;!&ndash; >挂起&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button&ndash;&gt;-->
<!-- &lt;!&ndash; type="primary"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="!formData.billNo"&ndash;&gt;-->
<!-- &lt;!&ndash; @click.native="cancelOrder()"&ndash;&gt;-->
<!-- &lt;!&ndash; >放弃&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- :disabled="!formData.billNo"-->
<!-- @click.native="confirmFinishOrder()"-->
<!-- >完成-->
<!-- @click.native="cancelOrder()"-->
<!-- >放弃-->
<!-- </el-button>-->
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="confirmFinishOrder()"
>完成
</el-button>
<!-- &lt;!&ndash; <el-dropdown @command="handleCommand">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary">&ndash;&gt;-->
<!-- &lt;!&ndash; 更多功能<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-dropdown-menu slot="dropdown">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货&ndash;&gt;-->
<!-- &lt;!&ndash; </el-dropdown-item>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单&ndash;&gt;-->
<!-- &lt;!&ndash; </el-dropdown-item>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-dropdown-menu>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-dropdown>&ndash;&gt;-->
<!-- </el-button-group>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-dropdown @command="handleCommand">-->
<!-- <el-button type="primary">-->
<!-- 更多功能<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
<!-- </el-button>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
</el-button-group>
</el-col>
</el-row>
<el-row style="margin-top: 6px;margin-bottom: -6px;"
v-if="this.formDataVisible != null && this.formDataVisible.scanType == 1">
@ -168,8 +164,8 @@
<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
<el-row :gutter="0" style="margin-top: 5px">
<el-col :span="18">
<el-form-item prop="code" label-width="0px">
<el-col :span="20">
<el-form-item prop="code" :label="scanTip" label-width="80px">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@ -183,7 +179,7 @@
<!-- :disabled="scanDisabled"-->
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="4">
<el-button-group style="display: flex;">
<el-button
type="primary"
@ -239,70 +235,7 @@
</div>
<el-row :gutter="0" style="margin-top: 15px">
<el-col :span="24" align="right">
<el-button-group>
<!-- <el-button type="primary" @click.native="deleteCode"-->
<!-- v-if="labelName == 1"-->
<!-- :disabled="formData.billNo == null"-->
<!-- >扫码剔除-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary"-->
<!-- v-if="labelName == 2"-->
<!-- @click.native="overdeleteCode"-->
<!-- >结束剔除-->
<!-- </el-button>-->
<el-button
type="primary"
:disabled="formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"
@click.native="nextCollectOrder()"
>下一单
</el-button>
<el-button
type="primary"
:disabled="formData.billNo ||(this.formDataVisible != null && this.formDataVisible.scanType == 1)"
@click.native="selectPrescribe()"
>选单
</el-button>
<!-- <el-button-->
<!-- type="primary"-->
<!-- :disabled="!formData.billNo"-->
<!-- @click.native="saveDraftOrder()"-->
<!-- >挂起-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- :disabled="!formData.billNo"-->
<!-- @click.native="cancelOrder()"-->
<!-- >放弃-->
<!-- </el-button>-->
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="confirmFinishOrder()"
>完成
</el-button>
<!-- <el-dropdown @command="handleCommand">-->
<!-- <el-button type="primary">-->
<!-- 更多功能<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
<!-- </el-button>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
</el-button-group>
</el-col>
</el-row>
<el-descriptions title="单据信息" :column="2" border style="margin-top: 15px">
<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
<el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
<el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item>
<el-descriptions-item label="收货方">{{ formData.fromCorpName }}</el-descriptions-item>
@ -311,27 +244,16 @@
<el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
<el-descriptions-item label="单据备注">{{ formData.remark }}</el-descriptions-item>
</el-descriptions>
</el-form>
<el-descriptions title="灯组信息" :column="2" border style="margin-top: 15px">
<i class="el-icon-s-opportunity"></i>
</el-descriptions>
</el-card>
</div>
<!-- 右侧面板 -->
<div class="content-right">
<!-- <el-tabs type="border-card" class="right-tabs" v-model="editableTabsValue">-->
<el-card type="border-card" class="right-tabs" v-model="editableTabsValue" style=" height: 800px;">
<!-- <el-tab-pane label="扫码详情" name="prescribeOriginPanel">-->
<el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue">
<el-tab-pane label="扫码详情" name="prescribeOriginPanel">
<prescribeOriginPanel
v-if="panelALive"
:prescribeData="curRow"
:fifoSplitResult="this.fifoSplitResult"
></prescribeOriginPanel>
<!-- &lt;!&ndash; 在表格下方添加说明 &ndash;&gt;-->
<!-- 在表格下方添加说明 -->
<!-- <el-row style="text-align: right;font-size: 12px;margin-top: 10px">-->
<!-- <el-col span="24">-->
<!-- <div style="float: right">-->
@ -358,7 +280,7 @@
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-tab-pane>-->
</el-tab-pane>
<!-- <el-tab-pane label="扫码明细">-->
<!-- <PanelOrderManuTagCode-->
<!-- v-if="panelALive"-->
@ -388,7 +310,7 @@
<!-- ></PanelOrderAllDetail>-->
<!-- </el-tab-pane>-->
</el-card>
</el-tabs>
<el-dialog
title="选入业务单据"
@ -460,8 +382,7 @@
</el-dialog>
</div>
</div>
</el-form>
</div>
</template>
@ -606,7 +527,7 @@ export default {
needSplitConfirm: false,
workplaceId: null,
ws: null,
scanTip: "单据录入",
scanTip: "单据录入:",
scanSplit: false,
info: {},
//
@ -648,18 +569,7 @@ export default {
}
})
},
colorStyle(ledNum) {
switch (ledNum) {
case 1:
return { color: 'red' };
case 2:
return { color: '#ec951f' };
case 3:
return { color: 'blue' };
case 4:
return { color: 'green' };
}
},
//是否拆零的组件调用父级方法
fifoSplitResult(data,info){
this.info = info
@ -668,7 +578,7 @@ export default {
if (data.needSplitConfirm){//需要
this.needSplitConfirm = data.needSplitConfirm
this.scanTitle = "拆零扫码结果:";
this.scanTip = "拆零扫码";
this.scanTip = "拆零扫码:";
this.result = "";
return;
}else {//不需要
@ -745,6 +655,7 @@ export default {
}
}
}
return
})
@ -1763,62 +1674,20 @@ export default {
</script>
<style scoped>
.page-container {
height: 100%;
width: 100%;
padding: 15px;
box-sizing: border-box;
}
.content-wrapper {
display: flex;
gap: 15px;
height: 100%;
width: 100%;
}
.content-left {
flex: 0 0 40%;
min-width: 0; /* 防止内容溢出 */
}
.content-right {
flex: 0 0 60%;
min-width: 0; /* 防止内容溢出 */
}
/* 保持卡片内容可滚动 */
.content-left :deep(.el-card__body) {
height: 100%;
overflow-y: auto;
}
/* 保持右侧标签页内容可滚动 */
.content-right :deep(.el-tabs__content) {
height: calc(100% - 40px);
overflow-y: auto;
}
/* 其他现有样式保持不变 */
.el-col {
margin: 0;
}
.el-alert {
margin-bottom: 16px;
margin-top: -5px;
margin-bottom: -5px;
}
.el-alert:last-child {
margin-bottom: 0;
.el-dropdown {
vertical-align: top;
}
.el-tabs--border-card {
height: 100%;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
.el-dropdown + .el-dropdown {
margin-left: 15px;
}
.query-form-item :deep(.el-form-item__content) {
display: flex;
align-items: center;
.el-icon-arrow-down {
font-size: 12px;
}
</style>

156
src/views/collect/PannelOrderBizCard.vue
Unescape Escape View File

@ -1,59 +1,39 @@
<template>
<div>
<el-row :gutter="20">
<el-col v-for="(info, index) in preDetailList" :key="index" :span="24">
<div class="drug-card">
<div class="card-content">
<div class="info-section">
<div class="info-row">
<span class="label">产品通用名：</span>
<span class="value product-name">{{ info.cpmctymc }}</span>
<el-row>
<el-col v-for="(info, index) in preDetailList" :key="index" :xs="12" :sm="6" :md="6" :lg="8" >
<el-card :body-style="{margin:'20px'}"
style="margin:20px 20px 20px 20px;;background-color: #e1f3fb;border-radius: 12px; position: relative;">
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
<p>产品通用名：</p> <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.cpmctymc }}</p>
</div>
<div class="info-row">
<span class="label">包装规格：</span>
<span class="value">{{ info.ggxh }}</span>
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
<p>包装规格：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.ggxh }}</p>
</div>
<div class="info-row">
<span class="label">制剂规格：</span>
<span class="value">{{ info.prepnSpec }}</span>
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
<p>制剂规格：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.prepnSpec }}</p>
</div>
<div class="info-row">
<span class="label">摆放位置：</span>
<span class="value">{{ info.queueCode }}</span>
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
<p>批次号：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.batchNo }}</p>
</div>
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
<p>摆放位置：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.queueCode }}</p>
</div>
<div class="action-section">
<div class="count-display">
<h1 class="count" :class="{ 'confirmed': info.getConfirm }">{{ info.count }}</h1>
<div class="light-info">
<!-- <i class="el-icon-s-opportunity"></i>-->
<!-- <span :style="colorStyle(info)">{{ info.colorName }}</span>-->
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
<p></p><p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;margin-top: 80px"><i class="el-icon-s-opportunity"></i>
<span :style="colorStyle(info)">{{ info.colorName}}</span></p>
</div>
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" >
<span><h1 :style="{ 'font-size': '45px', 'color': info.getConfirm ? '#67C23A' : '#F56C6C' }">{{ info.count }}</h1></span>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 130px;" icon="el-icon-document" @click="codeHandleClick(info)" :disabled="!info.getConfirm">赋码明细</el-button>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(info)" :disabled="info.getConfirm">确认取药</el-button>
</div>
<div class="count-display-right">
<el-button
type="primary"
icon="el-icon-thumb"
@click="handleClick(info)"
:disabled="info.getConfirm">
确认取药
</el-button>
<el-button
type="primary"
icon="el-icon-document"
@click="codeHandleClick(info)"
:disabled="!info.getConfirm">
赋码明细
</el-button>
</div>
</div>
</div>
</div>
</el-card>
</el-col>
</el-row>
<el-dialog
title="扫码明细"
:visible.sync="scanDetailVisible"
@ -365,94 +345,4 @@ export default {
</script>
<style scoped>
.drug-card {
margin: 1px 0;
background-color: #f6f6f6;
padding: 3px 10px 3px 10px;
border-radius: 12px;
}
.card-content {
display: flex;
padding: 0px 0px 0px 0px;
}
.info-section {
flex: 1;
}
.info-row {
display: flex;
align-items: center;
margin: 3px 0;
}
.label {
color: #606266;
font-size: 14px;
width: 100px;
flex-shrink: 0;
}
.value {
font-weight: bold;
font-size: 12px;
}
.label {
font-size: 12px;
}
.product-name {
font-size: 14px;
}
.action-section {
flex: 1 1 0%;
display: flex; /* 启用Flexbox布局 */
justify-content: space-between; /* 可选：让子元素在主轴上均匀分布，两端对齐 */
align-items: center; /* 可选：让子元素在交叉轴上居中对齐 */
}
.count-display {
flex: 5 1 0%; /* 默认情况下，flex属性为1的元素会平分剩余空间，但因为有两个这样的元素且我们设置了flex-basis，所以它们会按照设定的比例分配空间 */
flex-basis: 65%; /* 设置初始分配空间为55% */
/* 其他样式，如内边距、边框等 */
text-align: center;
margin-bottom: 0px;
}
.count-display-right {
flex: 1; /* 同样，flex属性为1 */
flex-basis: 35%; /* 设置初始分配空间为45%，与.count-display相加应为100%或稍小，以留出一些空间给内边距、边框等 */
/* 其他样式，特别是针对按钮的布局和样式 */
display: flex; /* 如果按钮需要在一行内显示，则启用Flexbox布局 */
flex-direction: column; /* 或者使用row，取决于按钮的布局需求 */
align-items: flex-end; /* 可选：让按钮组在容器内右对齐 */
gap: 10px; /* 设置按钮之间的垂直间隔 */
}
.count {
font-size: 45px;
margin: 0 0 10px 0;
}
.count.confirmed {
color: #67C23A;
}
.count:not(.confirmed) {
color: #F56C6C;
}
.light-info {
text-align: center;
}
.button-group {
display: flex;
gap: 10px;
}
</style>

Write Preview
Loading…
Cancel
Save