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 3a122c087a
commit d823b6fbf0
2 changed files with 138 additions and 103 deletions
Show Stats Download Patch File Download Diff File

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

@ -10,67 +10,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">
@ -162,9 +162,9 @@
</el-row> </el-row>
<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px"> <div style="margin-top: 1px;padding: 5px">
<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"
@ -179,7 +179,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"
@ -200,6 +200,24 @@
@click.native.stop="clearCode()" @click.native.stop="clearCode()"
>清空 >清空
</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
type="primary"
:disabled="!formData.billNo"
@click.native="confirmFinishOrder()"
>完成
</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
</el-row> </el-row>
@ -235,24 +253,30 @@
</div> </div>
<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px"> <el-descriptions :column="4" border style="margin-top: 5px">
<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>-->
<el-descriptions-item label="收货方">{{ formData.fromCorpName }}</el-descriptions-item> <el-descriptions-item label="收货方">{{ formData.fromCorpName }}</el-descriptions-item>
<el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item> <!-- <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>-->
<el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item> <!-- <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>-->
<el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item> <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
<el-descriptions-item label="单据备注">{{ formData.remark }}</el-descriptions-item> <!-- <el-descriptions-item label="单据备注">{{ formData.remark }}</el-descriptions-item>-->
<el-descriptions-item label="灯组信息">灯组信息</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card>
<el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue"> <div style="margin-top: 18px">
<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>
</div>
</el-card>
<!-- <el-card type="border-card" style="margin: 15px" v-model="editableTabsValue && formData.billNo">-->
<!-- <el-tab-pane label="详情" name="prescribeOriginPanel">-->
<!-- 在表格下方添加说明 --> <!-- 在表格下方添加说明 -->
<!-- <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">-->
@ -280,7 +304,7 @@
<!-- </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"-->
@ -310,7 +334,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

@ -1,36 +1,47 @@
<template> <template>
<div> <div>
<el-row> <el-row>
<el-col v-for="(info, index) in preDetailList" :key="index" :xs="12" :sm="6" :md="6" :lg="8" > <!-- <el-col v-for="(info, index) in preDetailList" :key="index" :xs="12" :sm="6" :md="6" :lg="8" >-->
<el-card :body-style="{margin:'20px'}" <!-- <el-card :body-style="{margin:'20px'}"-->
style="margin:20px 20px 20px 20px;;background-color: #e1f3fb;border-radius: 12px; position: relative;"> <!-- 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 */" > <!-- <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> <!-- <p>产品通用名：</p> <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.cpmctymc }}</p>-->
</div> <!-- </div>-->
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" > <!-- <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> <!-- <p>包装规格：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.ggxh }}</p>-->
</div> <!-- </div>-->
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" > <!-- <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> <!-- <p>制剂规格：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.prepnSpec }}</p>-->
</div> <!-- </div>-->
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" > <!-- <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> <!-- <p>摆放位置：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.queueCode }}</p>-->
</div> <!-- </div>-->
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" > <!-- <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> <!-- <p></p><p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;margin-top: 80px"><i class="el-icon-s-opportunity"></i>-->
</div> <!-- <span :style="colorStyle(info)">{{ info.colorName}}</span></p>-->
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" > <!-- </div>-->
<p></p><p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;margin-top: 80px"><i class="el-icon-s-opportunity"></i> <!-- <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" >-->
<span :style="colorStyle(info)">{{ info.colorName}}</span></p> <!-- <span><h1 :style="{ 'font-size': '45px', 'color': info.getConfirm ? '#67C23A' : '#F56C6C' }">{{ info.count }}</h1></span>-->
</div> <!-- <el-button type="primary" style="position: absolute; bottom: 20px; right: 130px;" icon="el-icon-document" @click="codeHandleClick(info)" :disabled="!info.getConfirm">赋码明细</el-button>-->
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" > <!-- <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(info)" :disabled="info.getConfirm">确认取药</el-button>-->
<span><h1 :style="{ 'font-size': '45px', 'color': info.getConfirm ? '#67C23A' : '#F56C6C' }">{{ info.count }}</h1></span> <!-- </div>-->
<el-button type="primary" style="position: absolute; bottom: 20px; right: 130px;" icon="el-icon-document" @click="codeHandleClick(info)" :disabled="!info.getConfirm">赋码明细</el-button> <!-- </el-card>-->
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(info)" :disabled="info.getConfirm">确认取药</el-button> <!-- </el-col>-->
</div>
</el-card> <el-table :data="preDetailList" :row-style="{ height: '50px',fontSize: '16px'}" highlight-current-row="true" border ref="multipleTable"
</el-col> px >
<el-table-column label="产品通用名" prop="cpmctymc" width="240"></el-table-column>
<el-table-column label="制剂规格" prop="prepnSpec" width="280"></el-table-column>
<el-table-column label="包装规格" prop="ggxh" width="100"></el-table-column>
<el-table-column label="摆放位置" prop="queueCode" ></el-table-column>
<el-table-column label="操作" width="280" fixed="right">
<template slot-scope="scope">
<el-button type="primary" icon="el-icon-document" @click="codeHandleClick(scope.row)" :disabled="!scope.row.getConfirm">赋码明细</el-button>
<el-button type="primary" icon="el-icon-thumb" @click="handleClick(scope.row)" :disabled="scope.row.getConfirm">确认取药</el-button>
</template>
</el-table-column>
</el-table>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save