fix:修复

20240912_adapter
chenhc 1 month ago
parent f0369878f5
commit d95aa93bec

@ -4,6 +4,7 @@
<!-- 左侧面板 --> <!-- 左侧面板 -->
<div class="content-left"> <div class="content-left">
<el-card style=" height: 800px;"> <el-card style=" height: 800px;">
<el-descriptions :title="scanTip" :column="2" border style="margin-top: 15px"></el-descriptions>
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" @submit.native.prevent> <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" @submit.native.prevent>
<!-- <el-alert--> <!-- <el-alert-->
@ -167,8 +168,8 @@
<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="16"> <el-col :span="18">
<el-form-item prop="code" :label="scanTip" label-width="80px"> <el-form-item prop="code" label-width="0px">
<el-input <el-input
id="inputer" id="inputer"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@ -182,7 +183,7 @@
<!-- :disabled="scanDisabled"--> <!-- :disabled="scanDisabled"-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-button-group style="display: flex;"> <el-button-group style="display: flex;">
<el-button <el-button
type="primary" type="primary"
@ -310,7 +311,13 @@
<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> </el-descriptions>
</el-form> </el-form>
<el-descriptions title="灯组信息" :column="2" border style="margin-top: 15px">
<i class="el-icon-s-opportunity"></i>
</el-descriptions>
</el-card> </el-card>
</div> </div>
@ -599,7 +606,7 @@ export default {
needSplitConfirm: false, needSplitConfirm: false,
workplaceId: null, workplaceId: null,
ws: null, ws: null,
scanTip: "单据录入:", scanTip: "单据录入",
scanSplit: false, scanSplit: false,
info: {}, info: {},
// //
@ -641,7 +648,18 @@ 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){ fifoSplitResult(data,info){
this.info = info this.info = info
@ -650,7 +668,7 @@ export default {
if (data.needSplitConfirm){// if (data.needSplitConfirm){//
this.needSplitConfirm = data.needSplitConfirm this.needSplitConfirm = data.needSplitConfirm
this.scanTitle = "拆零扫码结果:"; this.scanTitle = "拆零扫码结果:";
this.scanTip = "拆零扫码:"; this.scanTip = "拆零扫码";
this.result = ""; this.result = "";
return; return;
}else {// }else {//

@ -27,8 +27,8 @@
<div class="count-display"> <div class="count-display">
<h1 class="count" :class="{ 'confirmed': info.getConfirm }">{{ info.count }}</h1> <h1 class="count" :class="{ 'confirmed': info.getConfirm }">{{ info.count }}</h1>
<div class="light-info"> <div class="light-info">
<i class="el-icon-s-opportunity"></i> <!-- <i class="el-icon-s-opportunity"></i>-->
<span :style="colorStyle(info)">{{ info.colorName }}</span> <!-- <span :style="colorStyle(info)">{{ info.colorName }}</span>-->
</div> </div>
</div> </div>
<div class="count-display-right"> <div class="count-display-right">

Loading…
Cancel
Save