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

fix:修复

Browse Source
20240912_adapter
chenhc 1 month ago
parent 30ceed9614
commit 10bf5a55cf
2 changed files with 207 additions and 128 deletions
Show Stats Download Patch File Download Diff File

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

@ -13,67 +13,67 @@
<!-- type="warning">--> <!-- type="warning">-->
<!--</el-alert>--> <!--</el-alert>-->
<el-row :gutter="0" style="margin-top: 15px"> <!-- <el-row :gutter="0" style="margin-top: 15px">-->
<el-col :span="24" align="right"> <!-- <el-col :span="24" align="right">-->
<el-button-group> <!-- <el-button-group>-->
<!-- <el-button type="primary" @click.native="deleteCode"--> <!-- &lt;!&ndash; <el-button type="primary" @click.native="deleteCode"&ndash;&gt;-->
<!-- v-if="labelName == 1"--> <!-- &lt;!&ndash; v-if="labelName == 1"&ndash;&gt;-->
<!-- :disabled="formData.billNo == null"--> <!-- &lt;!&ndash; :disabled="formData.billNo == null"&ndash;&gt;-->
<!-- >扫码剔除--> <!-- &lt;!&ndash; >扫码剔除&ndash;&gt;-->
<!-- </el-button>--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- <el-button size="mini" type="primary"--> <!-- &lt;!&ndash; <el-button size="mini" type="primary"&ndash;&gt;-->
<!-- v-if="labelName == 2"--> <!-- &lt;!&ndash; v-if="labelName == 2"&ndash;&gt;-->
<!-- @click.native="overdeleteCode"--> <!-- &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-button>--> <!-- </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--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- :disabled="!formData.billNo"--> <!-- :disabled="formData.billNo ||(this.formDataVisible != null && this.formDataVisible.scanType == 1)"-->
<!-- @click.native="saveDraftOrder()"--> <!-- @click.native="selectPrescribe()"-->
<!-- >挂起--> <!-- >选单-->
<!-- </el-button>--> <!-- </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--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- :disabled="!formData.billNo"--> <!-- :disabled="!formData.billNo"-->
<!-- @click.native="cancelOrder()"--> <!-- @click.native="confirmFinishOrder()"-->
<!-- >放弃--> <!-- >完成-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="confirmFinishOrder()"
>完成
</el-button>
<!-- <el-dropdown @command="handleCommand">--> <!-- &lt;!&ndash; <el-dropdown @command="handleCommand">&ndash;&gt;-->
<!-- <el-button type="primary">--> <!-- &lt;!&ndash; <el-button type="primary">&ndash;&gt;-->
<!-- 更多功能<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>--> <!-- &lt;!&ndash; 更多功能<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&ndash;&gt;-->
<!-- </el-button>--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- <el-dropdown-menu slot="dropdown">--> <!-- &lt;!&ndash; <el-dropdown-menu slot="dropdown">&ndash;&gt;-->
<!-- <el-dropdown-item divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>--> <!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货--> <!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货&ndash;&gt;-->
<!-- </el-dropdown-item>--> <!-- &lt;!&ndash; </el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>--> <!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单--> <!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单&ndash;&gt;-->
<!-- </el-dropdown-item>--> <!-- &lt;!&ndash; </el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>--> <!-- &lt;!&ndash; <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>&ndash;&gt;-->
<!-- </el-dropdown-menu>--> <!-- &lt;!&ndash; </el-dropdown-menu>&ndash;&gt;-->
<!-- </el-dropdown>--> <!-- &lt;!&ndash; </el-dropdown>&ndash;&gt;-->
</el-button-group> <!-- </el-button-group>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
<el-row style="margin-top: 6px;margin-bottom: -6px;" <el-row style="margin-top: 6px;margin-bottom: -6px;"
v-if="this.formDataVisible != null && this.formDataVisible.scanType == 1"> v-if="this.formDataVisible != null && this.formDataVisible.scanType == 1">
@ -167,7 +167,7 @@
<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px"> <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
<el-row :gutter="0" style="margin-top: 5px"> <el-row :gutter="0" style="margin-top: 5px">
<el-col :span="20"> <el-col :span="16">
<el-form-item prop="code" :label="scanTip" label-width="80px"> <el-form-item prop="code" :label="scanTip" label-width="80px">
<el-input <el-input
id="inputer" id="inputer"
@ -182,7 +182,7 @@
<!-- :disabled="scanDisabled"--> <!-- :disabled="scanDisabled"-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="8">
<el-button-group style="display: flex;"> <el-button-group style="display: flex;">
<el-button <el-button
type="primary" type="primary"
@ -238,6 +238,69 @@
</div> </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="2" border style="margin-top: 15px">
<el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item> <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
<el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item> <el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item>
@ -253,41 +316,42 @@
<!-- 右侧面板 --> <!-- 右侧面板 -->
<div class="content-right"> <div class="content-right">
<el-tabs type="border-card" class="right-tabs" v-model="editableTabsValue"> <!-- <el-tabs type="border-card" class="right-tabs" v-model="editableTabsValue">-->
<el-tab-pane label="扫码详情" name="prescribeOriginPanel"> <el-card type="border-card" class="right-tabs" v-model="editableTabsValue">
<!-- <el-tab-pane label="扫码详情" name="prescribeOriginPanel">-->
<prescribeOriginPanel <prescribeOriginPanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
:fifoSplitResult="this.fifoSplitResult" :fifoSplitResult="this.fifoSplitResult"
></prescribeOriginPanel> ></prescribeOriginPanel>
<!-- 在表格下方添加说明 --> <!-- &lt;!&ndash; 在表格下方添加说明 &ndash;&gt;-->
<el-row style="text-align: right;font-size: 12px;margin-top: 10px"> <!-- <el-row style="text-align: right;font-size: 12px;margin-top: 10px">-->
<el-col span="24"> <!-- <el-col span="24">-->
<div style="float: right"> <!-- <div style="float: right">-->
<td> <!-- <td>-->
<div style="background-color: #F56C6C;width: 10px;height: 10px;"></div> <!-- <div style="background-color: #F56C6C;width: 10px;height: 10px;"></div>-->
</td> <!-- </td>-->
<td><span style="color: #6d6d6d;"><pre>未赋码 </pre></span></td> <!-- <td><span style="color: #6d6d6d;"><pre>未赋码 </pre></span></td>-->
<td> <!-- <td>-->
<div style="background-color: #E6A23C;width: 10px;height: 10px;"></div> <!-- <div style="background-color: #E6A23C;width: 10px;height: 10px;"></div>-->
</td> <!-- </td>-->
<td> <!-- <td>-->
<span style="color: #6d6d6d;"><pre>预赋码 </pre></span> <!-- <span style="color: #6d6d6d;"><pre>预赋码 </pre></span>-->
</td> <!-- </td>-->
<td> <!-- <td>-->
<div style="background-color: #67C23A;width: 10px;height: 10px;"></div> <!-- <div style="background-color: #67C23A;width: 10px;height: 10px;"></div>-->
</td> <!-- </td>-->
<td> <!-- <td>-->
<span style="color: #6d6d6d;"><pre>已赋码</pre></span> <!-- <span style="color: #6d6d6d;"><pre>已赋码</pre></span>-->
</td> <!-- </td>-->
</div> <!-- </div>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-tab-pane> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="扫码明细">--> <!-- <el-tab-pane label="扫码明细">-->
<!-- <PanelOrderManuTagCode--> <!-- <PanelOrderManuTagCode-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
@ -317,7 +381,7 @@
<!-- ></PanelOrderAllDetail>--> <!-- ></PanelOrderAllDetail>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
</el-tabs> </el-card>
<el-dialog <el-dialog
title="选入业务单据" title="选入业务单据"

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

@ -2,7 +2,7 @@
<div> <div>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col v-for="(info, index) in preDetailList" :key="index" :span="24"> <el-col v-for="(info, index) in preDetailList" :key="index" :span="24">
<el-card class="drug-card"> <div class="drug-card">
<div class="card-content"> <div class="card-content">
<div class="info-section"> <div class="info-section">
<div class="info-row"> <div class="info-row">
@ -17,10 +17,6 @@
<span class="label">制剂规格：</span> <span class="label">制剂规格：</span>
<span class="value">{{ info.prepnSpec }}</span> <span class="value">{{ info.prepnSpec }}</span>
</div> </div>
<div class="info-row">
<span class="label">批次号：</span>
<span class="value">{{ info.batchNo }}</span>
</div>
<div class="info-row"> <div class="info-row">
<span class="label">摆放位置：</span> <span class="label">摆放位置：</span>
<span class="value">{{ info.queueCode }}</span> <span class="value">{{ info.queueCode }}</span>
@ -35,14 +31,7 @@
<span :style="colorStyle(info)">{{ info.colorName }}</span> <span :style="colorStyle(info)">{{ info.colorName }}</span>
</div> </div>
</div> </div>
<div class="button-group"> <div class="count-display-right">
<el-button
type="primary"
icon="el-icon-document"
@click="codeHandleClick(info)"
:disabled="!info.getConfirm">
赋码明细
</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-thumb" icon="el-icon-thumb"
@ -50,10 +39,18 @@
:disabled="info.getConfirm"> :disabled="info.getConfirm">
确认取药 确认取药
</el-button> </el-button>
<el-button
type="primary"
icon="el-icon-document"
@click="codeHandleClick(info)"
:disabled="!info.getConfirm">
赋码明细
</el-button>
</div>
</div> </div>
</div> </div>
</div> </div>
</el-card>
</el-col> </el-col>
</el-row> </el-row>
@ -369,16 +366,15 @@ export default {
<style scoped> <style scoped>
.drug-card { .drug-card {
margin: 10px 0; margin: 1px 0;
background-color: #e1f3fb; background-color: #f6f6f6;
padding: 3px 10px 3px 10px;
border-radius: 12px; border-radius: 12px;
} }
.card-content { .card-content {
display: flex; display: flex;
justify-content: space-between; padding: 0px 0px 0px 0px;
align-items: center;
} }
.info-section { .info-section {
@ -388,7 +384,7 @@ export default {
.info-row { .info-row {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 8px 0; margin: 3px 0;
} }
.label { .label {
@ -400,25 +396,44 @@ export default {
.value { .value {
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 12px;
}
.label {
font-size: 12px;
} }
.product-name { .product-name {
font-size: 16px; font-size: 14px;
} }
.action-section { .action-section {
display: flex; flex: 1 1 0%;
flex-direction: column; display: flex; /* 启用Flexbox布局 */
align-items: center; justify-content: space-between; /* 可选：让子元素在主轴上均匀分布，两端对齐 */
margin-left: 40px; align-items: center; /* 可选：让子元素在交叉轴上居中对齐 */
} }
.count-display { .count-display {
flex: 5 1 0%; /* 默认情况下，flex属性为1的元素会平分剩余空间，但因为有两个这样的元素且我们设置了flex-basis，所以它们会按照设定的比例分配空间 */
flex-basis: 65%; /* 设置初始分配空间为55% */
/* 其他样式，如内边距、边框等 */
text-align: center; text-align: center;
margin-bottom: 20px; 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 { .count {
font-size: 45px; font-size: 45px;
margin: 0 0 10px 0; margin: 0 0 10px 0;

Write Preview
Loading…
Cancel
Save