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

上货剔除

Browse Source
20240912_adapter
yewj 8 months ago
parent 1feb68be56
commit 5ac40a0946
3 changed files with 225 additions and 196 deletions
Show Stats Download Patch File Download Diff File

207
src/views/collect/IoSplitFifoRemove.vue
Unescape Escape View File

@ -9,20 +9,22 @@
label-width="110px"
>
<el-card>
<el-row style="margin-bottom: 8px">
<!--<div v-if="scanReCount > 0">-->
<!-- <span style="font-size: 18px;font-weight: bold;color: red" >扫码总数量:</span>-->
<!-- <span style="font-size: 18px;font-weight: bold;color: red">{{ scanReCount }}</span>-->
<!--</div>-->
<span style="font-size: 18px;font-weight: bold;color: red" v-if="redMeg"
>请先扫取货槽编码</span>
<span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>
<!--<span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>-->
<!-- <el-row style="margin-bottom: 8px">-->
<!-- &lt;!&ndash;<div v-if="scanReCount > 0">&ndash;&gt;-->
<!-- &lt;!&ndash; <span style="font-size: 18px;font-weight: bold;color: red" >扫码总数量:</span>&ndash;&gt;-->
<!-- &lt;!&ndash; <span style="font-size: 18px;font-weight: bold;color: red">{{ scanReCount }}</span>&ndash;&gt;-->
<!-- &lt;!&ndash;</div>&ndash;&gt;-->
<!-- &lt;!&ndash;<span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>&ndash;&gt;-->
<!-- -->
<!-- </el-row>-->
<el-button-group
style="display: flex; margin-top: 5px; float: right"
>
<el-button size="mini" type="primary" @click.native="paizhao()"
v-if="collectSet != null && collectSet.autoDecode == 0" style="margin-right: 8px;border-radius: 5%;"
v-if="collectSet != null && collectSet.autoDecode == 0"
style="margin-right: 8px;border-radius: 5%;"
>拍照解码
</el-button>
<el-button size="mini" type="primary" @click.native="fallbackCode()" :disabled="redMeg"
@ -35,7 +37,16 @@
</el-button>
</el-button-group>
<el-row>
<span style="font-size: 18px;font-weight: bold;color: red" v-if="redMeg"
>请先扫取货槽编码</span>
<span style="font-size: 18px;font-weight: bold">{{ curQueueName }} </span>
</el-row>
<el-row style="margin-top: 1px;margin-bottom: 8px">
<span style="font-size: 18px;font-weight: bold;"> {{ curProductData }} </span>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col :span="18">
@ -97,13 +108,14 @@
</el-alert>
<el-row :gutter="24" style="margin-top: 10px">
<el-col :span="12" style="border: 1px solid #e3dfe1; padding:15px; height: 400px; margin-left: 15px;">
<h2 style="font-weight: bold;">当前上药队列</h2>
<el-col :span="12" style="border: 1px solid #e3dfe1; padding:15px;height: 420px; margin-left: 15px;">
<!-- <h2 style="font-weight: bold;">当前上药队列</h2>-->
<span style="font-weight: bold;font-size: 18px"> 当前上药队列</span>
<el-table
:data="queueCodes"
:span-method="objectSpanMethod"
border
max-height="280px"
border :row-style="{height:'35px'}"
height="350px"
style="width: 100%; margin-top: 20px"
>
<el-table-column label="序号" width="80">
@ -111,10 +123,16 @@
{{ getDisplayIndex($index) }}
</template>
</el-table-column>
<el-table-column
prop="serialNo"
label="序列号"
width="180"
>
</el-table-column>
<el-table-column
prop="code"
label="追溯码"
width="180"
>
<!--show-overflow-tooltip-->
@ -129,41 +147,37 @@
<!-- label="药品名称"-->
<!--&gt;-->
<!--</el-table-column>-->
<el-table-column
prop="nameCode"
label="产品标识"
>
</el-table-column>
<el-table-column
prop="prepnSpec"
label="制剂规格"
>
</el-table-column>
<el-table-column
prop="bzgg"
label="包装规格"
>
</el-table-column>
<el-table-column
prop="serialNo"
label="序列号"
>
</el-table-column>
<el-table-column
prop="batchNo"
label="批次号"
>
</el-table-column>
<el-table-column
prop="produceDate"
label="生产日期"
>
</el-table-column>
<el-table-column
prop="expireDate"
label="失效日期"
>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="nameCode"-->
<!-- label="产品标识"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="prepnSpec"-->
<!-- label="制剂规格"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="bzgg"-->
<!-- label="包装规格"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="batchNo"-->
<!-- label="批次号"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="produceDate"-->
<!-- label="生产日期"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="expireDate"-->
<!-- label="失效日期"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- 添加 id 列，设置为隐藏 -->
<!--<el-table-column prop="id" label="ID" width="0" v-show="true"></el-table-column>-->
</el-table>
@ -177,11 +191,13 @@
<!--</pagination>-->
</el-col>
<el-col :span="11" style="border: 1px solid #e3dfe1; margin-left: 27px; padding: 15px;height: 400px;">
<h2 style="font-weight: bold;">工位库存队列</h2>
<el-col :span="11" style="border: 1px solid #e3dfe1; margin-left: 27px; padding: 15px;height: 420px;">
<!-- <h2 style="font-weight: bold;">工位库存队列</h2>-->
<span style="font-weight: bold;font-size: 18px"> 工位库存队列</span>
<!--<el-divider></el-divider>-->
<!--<div style=" border-top: 1px solid #ccc;">-->
<el-table v-loading="loading" :data="splitCodes" style="width: 100%;margin-top: 20px" max-height="280px"
<el-table v-loading="loading" :data="splitCodes" style="width: 100%;margin-top: 20px" height="350px"
:row-style="{height:'35px'}"
ref="multipleTable"
>
<!-- <el-table-column-->
@ -203,11 +219,15 @@
<!-- </div>-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column
prop="serialNo"
label="序列号"
width="180"
>
</el-table-column>
<el-table-column
prop="code"
label="追溯码"
width="180"
>
</el-table-column>
<!--<el-table-column-->
@ -215,41 +235,37 @@
<!-- label="药品名称"-->
<!--&gt;-->
<!--</el-table-column>-->
<el-table-column
prop="nameCode"
label="产品标识"
>
</el-table-column>
<el-table-column
prop="bzgg"
label="制剂规格"
>
</el-table-column>
<el-table-column
prop="bzgg"
label="包装规格"
>
</el-table-column>
<el-table-column
prop="serialNo"
label="序列号"
>
</el-table-column>
<el-table-column
prop="batchNo"
label="批次号"
>
</el-table-column>
<el-table-column
prop="produceDate"
label="生产日期"
>
</el-table-column>
<el-table-column
prop="expireDate"
label="失效日期"
>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="nameCode"-->
<!-- label="产品标识"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="bzgg"-->
<!-- label="制剂规格"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="bzgg"-->
<!-- label="包装规格"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="batchNo"-->
<!-- label="批次号"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="produceDate"-->
<!-- label="生产日期"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="expireDate"-->
<!-- label="失效日期"-->
<!-- >-->
<!-- </el-table-column>-->
</el-table>
<!--<pagination-->
<!-- v-show="splitCodeTotal>0"-->
@ -313,6 +329,7 @@ export default {
curQueue: null,
productName: null,
curQueueName: '',
curProductData: '',
queueCodeTotal: 0,
splitCodeTotal: 0,
//是否录入槽位
@ -599,6 +616,7 @@ export default {
this.curQueue = response.data
this.productName = this.curQueue.cpmctymc
this.curQueueName = this.getQueueName()
this.curProductData = this.getCurProduct()
this.redMeg = false
this.isCheckQueue = true
this.init()
@ -622,10 +640,15 @@ export default {
// 获取当前取货槽名称
getQueueName() {
if (isBlank(this.productName)) {
return `当前取货槽: ${this.curQueue.code}`
return `当前取货槽： ${this.curQueue.code}`
}
return `当前取货槽: ${this.productName} (${this.curQueue.code})`
return `当前取货槽：${this.curQueue.code}`
},
getCurProduct() {
return "取货槽信息：" + this.curQueue.cpmctymc + "-" + this.curQueue.ggxh + "-" + this.curQueue.prepnSpec
},
getCodes() {
this.queueQuery.action = 'SC72197936495755'
this.queueQuery.queueCode = this.curQueue.code

30
src/views/collect/newCreateCodeDetail.vue
Unescape Escape View File

@ -1,29 +1,33 @@
<template>
<div>
<el-row :gutter="30">
<el-col :span="15" style="border: 1px solid #e3dfe1; padding:15px; height: 400px; margin-left: 20px; overflow-y: scroll;">
<h2 style="font-weight: bold;">上货信息</h2>
<el-col :span="15"
style="border: 1px solid #e3dfe1; padding:15px; height: 400px; margin-left: 20px; overflow-y: scroll;">
<!-- <h2 style="font-weight: bold;">上货信息</h2>-->
<span style="font-weight: bold;font-size: 18px"> 上货信息</span>
<div v-for="(item, index) in detailList" :key="index" class="product-info">
<div class="info-item">
<p class="p-title">产品通用名: {{ item.coName }}</p>
<p class="p-title">制剂规格: {{ item.prepnSpec }}</p>
<p class="p-title">包装规格: {{ item.bzgg }}</p>
<p class="p-title">产品通用名： {{ item.coName }}</p>
<p class="p-title">制剂规格&nbsp;：{{ item.prepnSpec }}</p>
<p class="p-title">包装规格&nbsp;：{{ item.bzgg }}</p>
<!--<p class="p-title">产品标识: {{ item.nameCode }}</p>-->
<p class="p-title">批次号: {{ item.batchNo }}</p>
<p class="p-title">生产日期: {{ item.productDate }}</p>
<p class="p-title">失效日期: {{ item.expireDate }}</p>
<p class="p-title">批次号&nbsp;&nbsp;&nbsp;&nbsp;：{{ item.batchNo }}</p>
<p class="p-title">生产日期&nbsp;：{{ item.productDate }}</p>
<p class="p-title">失效日期&nbsp;：{{ item.expireDate }}</p>
</div>
<div class="count-items">
<p class="p-title">扫码数量: <span class="scan-count">{{ item.count }}</span></p>
<p class="p-title">实际数量: <span class="actual-count">{{ item.reCount }}{{ item.prepnUnit }}</span></p>
<p class="p-title">扫码数量&nbsp;： <span class="scan-count">{{ item.count }}</span></p>
<p class="p-title">实际数量&nbsp;：<span class="actual-count">{{ item.reCount }}{{ item.prepnUnit }}</span></p>
</div>
</div>
</el-col>
<el-col :span="8" style="border: 1px solid #e3dfe1; margin-left: 20px; padding: 15px;height: 400px;">
<h2 style="font-weight: bold;">扫码明细({{codeCount}})</h2>
<!-- <h2 style="font-weight: bold;">扫码明细({{ codeCount }})</h2>-->
<span style="font-weight: bold;font-size: 18px">扫码明细({{ codeCount }})</span>
<!--<el-divider></el-divider>-->
<div style=" border-top: 1px solid #ccc;">
<div style=" border-top: 1px solid #ccc;margin-top: 3px">
<el-table v-loading="loading" :data="codeArray" style="width: 100%; margin-top: 20px" max-height="280px"
ref="multipleTable">
<!-- <el-table-column-->
@ -272,6 +276,7 @@ export default {
border-top: 1px solid #ccc;
align-items: center;
padding: 10px;
margin-top: 3px;
margin-bottom: 10px;
}
@ -297,6 +302,7 @@ export default {
color: green;
font-size: 38px;
}
.p-title {
font-size: 18px;

Write Preview
Loading…
Cancel
Save