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

3/14 处理单据优化1.0

Browse Source
20240912_adapter
wangwei 1 week ago
parent 34595eb98e
commit dc1c872c5c
2 changed files with 120 additions and 88 deletions
Show Stats Download Patch File Download Diff File

106
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -100,8 +100,11 @@
<div style="margin-top: 1px;padding: 5px"> <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="16"> <el-col :span="16">
<!--:label="scanTip" -->
<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"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@ -111,13 +114,13 @@
type="tel" type="tel"
:placeholder="this.placeholder" :placeholder="this.placeholder"
v-model="scanCode" v-model="scanCode"
size="50"
></el-input> ></el-input>
<!-- :disabled="scanDisabled"-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-button-group style="display: flex; margin-left: 15px"> <el-button-group style="display: flex; margin-left: 15px;height: 36px">
<el-button type="primary" @click.native="deleteCode" <el-button type="primary" @click.native="deleteCode"
v-if="labelName == 1" v-if="labelName == 1"
:disabled="formData.billNo == null" :disabled="formData.billNo == null"
@ -161,85 +164,50 @@
</el-checkbox> </el-checkbox>
</el-col> </el-col>
</el-row> </el-row>
<el-alert <!--<el-alert-->
:title="scanTitle" <!-- :title="scanTitle"-->
:type="scanResultType" <!-- :type="scanResultType"-->
:closable="false" <!-- :closable="false"-->
:dangerouslyUseHTMLString="true" <!-- :dangerouslyUseHTMLString="true"-->
:description="result"> <!-- :description="result">-->
</el-alert> <!--</el-alert>-->
<el-alert <!--<el-alert-->
v-if="warnVisible" <!-- v-if="warnVisible"-->
title="警告信息:" <!-- title="警告信息:"-->
type="warning" <!-- type="warning"-->
:closable="true" <!-- :closable="true"-->
:dangerouslyUseHTMLString="true" <!-- :dangerouslyUseHTMLString="true"-->
:description="warnResult"> <!-- :description="warnResult">-->
</el-alert> <!--</el-alert>-->
<el-alert <!--<el-alert-->
v-if="errVisible" <!-- v-if="errVisible"-->
title="错误信息:" <!-- title="错误信息:"-->
type="warning" <!-- type="warning"-->
:closable="true" <!-- :closable="true"-->
:dangerouslyUseHTMLString="true" <!-- :dangerouslyUseHTMLString="true"-->
:description="errResult"> <!-- :description="errResult">-->
</el-alert> <!--</el-alert>-->
</div> </div>
<!--<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px" class="custom-descriptions">--> <!--<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px" class="custom-descriptions">-->
<el-descriptions :column="7" border style="margin-top: 5px"> <el-descriptions :column="7" border style="margin-top: 5px; font-size: 16px">
<!--{{ formData.billNo }}--> <el-descriptions-item label="业务单号"><div style="font-size: 15px">{{ formData.billNo }}</div></el-descriptions-item>
<!--<el-descriptions-item label="业务单号">--> <el-descriptions-item label="发货方"><div style="font-size: 15px">{{ formData.shipperName }}</div></el-descriptions-item>
<!--<svg ref="barcodeContainer" ></svg>--> <el-descriptions-item label="收货方"><div style="font-size: 15px">{{ formData.fromCorpName }}</div></el-descriptions-item>
<!--<div class="barcode-wrapper" >--> <el-descriptions-item label="单据时间"><div style="font-size: 15px">{{ formData.billTime }}</div></el-descriptions-item>
<!-- <svg ref="barcodeContainer" v-show="formData.billNo != null"></svg>--> </el-descriptions>
<!-- &lt;!&ndash;<span>{{ formData.billNo }}</span>&ndash;&gt;-->
<!--</div>-->
<!--</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.fromCorpName }}</el-descriptions-item>
<el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
</el-descriptions>
<!--<div id="qrcode-container" ref="barcodeContainer" style="margin-right: 38px;padding-bottom: 30px"></div>--> <!--<div id="qrcode-container" ref="barcodeContainer" style="margin-right: 38px;padding-bottom: 30px"></div>-->
<!--<svg ref="barcodeContainer"></svg>--> <!--<svg ref="barcodeContainer"></svg>-->
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue" v-show=" formData.billNo != null"> <el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue" >
<!--<el-tab-pane label="扫码详情" name="prescribeOriginPanel">--> <!--<el-tab-pane label="扫码详情" name="prescribeOriginPanel">-->
<prescribeOriginPanel <prescribeOriginPanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeOriginPanel> ></prescribeOriginPanel>
<!-- 在表格下方添加说明 --> <!-- 在表格下方添加说明 -->
<el-row style="text-align: right;font-size: 12px;margin-top: 10px">
<el-col span="24">
<div style="float: right">
<td>
<div style="background-color: #F56C6C;width: 10px;height: 10px;"></div>
</td>
<td><span style="color: #6d6d6d;"><pre>未赋码 </pre></span></td>
<td>
<div style="background-color: #E6A23C;width: 10px;height: 10px;"></div>
</td>
<td>
<span style="color: #6d6d6d;"><pre>预赋码 </pre></span>
</td>
<td>
<div style="background-color: #67C23A;width: 10px;height: 10px;"></div>
</td>
<td>
<span style="color: #6d6d6d;"><pre>已赋码</pre></span>
</td>
</div>
</el-col>
</el-row>
<!--</el-tab-pane>--> <!--</el-tab-pane>-->
<!-- <el-tab-pane label="扫码明细">--> <!-- <el-tab-pane label="扫码明细">-->
<!-- <PanelOrderManuTagCode--> <!-- <PanelOrderManuTagCode-->
@ -1871,6 +1839,10 @@ export default {
} }
.custom-input-height {
height: 40px !important; /* 设置高度 */
}
.barcode-wrapper { .barcode-wrapper {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

102
src/views/collect/PannelOrderBiz.vue
Unescape Escape View File

@ -112,36 +112,62 @@
<!-- </template>--> <!-- </template>-->
<!--</el-table>--> <!--</el-table>-->
<el-table :data="preDetailList" highlight-current-row="true" border ref="multipleTable" :row-style="rowStyle"> <el-table :data="preDetailList" highlight-current-row="true" border ref="multipleTable" size="100"
<el-table-column label="产品通用名" prop="cpmctymc" width="240"></el-table-column> :row-style="{ height: '60px' }"
<el-table-column label="制剂规格" prop="prepnSpec" width="280"></el-table-column> :cell-style="{ padding: '0' }"
<el-table-column label="包装规格" prop="spec" width="100"></el-table-column> >
<el-table-column label="单据数量" prop="count" width="80"> <el-table-column label="赋码状态" prop="cpmctymc" >
<template v-slot="scope">
<div style="text-align: center;">
<el-tag :type="getTagColor(scope.row)" size="26" >
{{ codingStatus }}
</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" >
<template v-slot="scope">
<div :style="{ fontSize: '16px' }">{{ scope.row.cpmctymc }}</div>
</template>
</el-table-column>
<el-table-column label="单据数量" prop="count" >
<template v-slot="scope"> <template v-slot="scope">
<div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div> <div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扫码数量" prop="scanActCount" width="80"> <el-table-column label="应扫码数量" prop="scanActCount" >
<template v-slot="scope"> <template v-slot="scope">
<div :style="{ fontSize: '26px', }">{{ scope.row.scanActCount }}</div> <div :style="getCellStyle(scope.row)">{{scope.row.scanCount}}/{{ scope.row.shouldCount }}</div>
</template>
</el-table-column>
<el-table-column label="制剂规格" prop="prepnSpec" >
<template v-slot="scope">
<div :style="{ fontSize: '16px' }">{{ scope.row.prepnSpec }}</div>
</template>
</el-table-column>
<el-table-column label="包装规格" prop="spec" >
<template v-slot="scope">
<div :style="{ fontSize: '16px' }">{{ scope.row.spec }}</div>
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="工位库存" prop="tempWorkPlaceCount" width="80">--> <!--<el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column> fixed="right"-->
<!-- <template v-slot="scope">--> <el-table-column label="医保编码" prop="ybbm" width="240">
<!-- <div :style="{ fontSize: '26px' }">{{ scope.row.tempWorkPlaceCount }}</div>--> <template v-slot="scope">
<!-- </template>--> <div :style="{ fontSize: '16px' }">{{ scope.row.ybbm }}</div>
<!--</el-table-column>--> </template>
<!--<el-table-column label="拆零数量" prop="tempSplitCount" width="80">--> </el-table-column>
<!-- <template v-slot="scope">--> <el-table-column label="批次号" prop="batchNo" >
<!-- <div :style="{ fontSize: '26px' }">{{ scope.row.tempSplitCount }}</div>--> <template v-slot="scope">
<!-- </template>--> <div :style="{ fontSize: '16px' }">{{ scope.row.batchNo }}</div>
<!--</el-table-column>--> </template>
<el-table-column label="批次号" prop="batchNo" width="80"></el-table-column> </el-table-column>
<!--<el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>-->
<el-table-column label="医保编码" prop="ybbm" width="240"></el-table-column>
<el-table-column label="操作" width="140" fixed="right"> >
<el-table-column
fixed="right"
label="操作"
width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" @click="scanDetail(scope.row)" style="font-size: 14px" :disabled="scope.row.scanCount == null || scope.row.scanCount == 0 "> <el-button type="primary" @click="scanDetail(scope.row)" style="font-size: 14px" :disabled="scope.row.scanCount == null || scope.row.scanCount == 0 ">
扫码明细({{scope.row.scanCount == null ? 0 : scope.row.scanCount }})</el-button> 扫码明细({{scope.row.scanCount == null ? 0 : scope.row.scanCount }})</el-button>
@ -233,6 +259,7 @@ export default {
countVisible: false, countVisible: false,
scanDetailVisible: false, scanDetailVisible: false,
bizId: null, bizId: null,
codingStatus: '已赋码',
} }
}, },
methods: { methods: {
@ -348,6 +375,38 @@ export default {
return rowBackground; return rowBackground;
}, },
getCellStyle(row){
let cellStyle = {
fontSize: '32px'
};
if (row.shouldCount == 0){
cellStyle.fontSize = '30px'
cellStyle.color = '#F56C6C'
return cellStyle;
}
if (row.scanCount < row.shouldCount) {
cellStyle.color = '#F56C6C';
} else if (row.scanCount === row.shouldCount) {
cellStyle.color = '#56a717';
}
return cellStyle;
},
// cellStyle({ row, column, rowIndex, columnIndex }) {
// return { height: '60px' };
// },
getTagColor(row) {
if (row.scanActCount < row.count) {
this.codingStatus = '未赋码'
return 'danger'; // 红色
} else if (row.autoTagStatus == 2) {
this.codingStatus = '预赋码'
return 'warning'; // 黄色
} else if (row.scanActCount >= row.count) {
this.codingStatus = '已赋码'
return 'success'; // 绿色
}
}
}, },
@ -379,4 +438,5 @@ export default {
<style scoped> <style scoped>
</style> </style>

Write Preview
Loading…
Cancel
Save