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

3/14 界面优化1.1

Browse Source
20240912_adapter
wangwei 3 weeks ago
parent 49cffc98fd
commit cdffe690c4
6 changed files with 232 additions and 172 deletions
Show Stats Download Patch File Download Diff File

93
src/views/collect/CollectOrderTabs.vue
Unescape Escape View File

@ -61,24 +61,24 @@
<span slot="title">处理单据</span> <span slot="title">处理单据</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=9 @click="clickMenuItem(9)" v-if="workPlaceClass == 1"> <!--<el-menu-item :index=9 @click="clickMenuItem(9)" v-if="workPlaceClass == 1">-->
<span slot="title">取药确认</span> <!-- <span slot="title">取药确认</span>-->
</el-menu-item> <!--</el-menu-item>-->
<el-menu-item :index=10 @click="clickMenuItem(10)" v-if="workPlaceClass == 1"> <el-menu-item :index=10 @click="clickMenuItem(10)" v-if="workPlaceClass == 1">
<span slot="title">单据审核</span> <span slot="title">单据审核</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=4 @click="clickMenuItem(4)" v-if="workPlaceClass == 1"> <!--<el-menu-item :index=4 @click="clickMenuItem(4)" v-if="workPlaceClass == 1">-->
<span slot="title">待处理单</span> <!-- <span slot="title">待处理单</span>-->
</el-menu-item> <!--</el-menu-item>-->
<el-menu-item :index=11 @click="clickMenuItem(11)" v-if="workPlaceClass == 1"> <!--<el-menu-item :index=11 @click="clickMenuItem(11)" v-if="workPlaceClass == 1">-->
<span slot="title">单据校验</span> <!-- <span slot="title">单据校验</span>-->
</el-menu-item> <!--</el-menu-item>-->
<el-menu-item :index=5 @click="clickMenuItem(5)" v-if="workPlaceClass == 1"> <el-menu-item :index=5 @click="clickMenuItem(5)" v-if="workPlaceClass == 1">
<span slot="title">已完成单</span> <span slot="title">已完成单</span>
@ -89,22 +89,22 @@
</el-menu-item> </el-menu-item>
<el-menu-item :index=1 @click="clickMenuItem(1)" v-if="workPlaceClass == 2"> <el-menu-item :index=1 @click="clickMenuItem(1)" v-if="workPlaceClass == 2 && jobMode == 0">
<span slot="title">工位上货</span> <span slot="title">工位上货</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=15 @click="clickMenuItem(15)" v-if="workPlaceClass == 2"> <el-menu-item :index=15 @click="clickMenuItem(15)" v-if="workPlaceClass == 2 && jobMode == 1">
<span slot="title">拆零上货</span> <span slot="title">拆零上货</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=16 @click="clickMenuItem(16)" v-if="workPlaceClass == 2"> <el-menu-item :index=16 @click="clickMenuItem(16)" v-if="workPlaceClass == 2 && jobMode == 1">
<span slot="title">整取上货</span> <span slot="title">整取上货</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2"> <!--<el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2">-->
<span slot="title">工位剔除</span> <!-- <span slot="title">工位剔除</span>-->
</el-menu-item> <!--</el-menu-item>-->
<el-menu-item :index=8 @click="clickMenuItem(8)" v-if="workPlaceClass == 2"> <el-menu-item :index=8 @click="clickMenuItem(8)" v-if="workPlaceClass == 2">
<span slot="title">上货推荐</span> <span slot="title">上货推荐</span>
@ -150,10 +150,10 @@
<span slot="title">单据审核</span> <span slot="title">单据审核</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=400 @click="clickMenuItem(400)" v-if="workPlaceClass == 1"> <!--<el-menu-item :index=400 @click="clickMenuItem(400)" v-if="workPlaceClass == 1">-->
<span slot="title">待处理单</span> <!-- <span slot="title">待处理单</span>-->
</el-menu-item> <!--</el-menu-item>-->
<el-menu-item :index=500 @click="clickMenuItem(500)" v-if="workPlaceClass == 1"> <el-menu-item :index=500 @click="clickMenuItem(500)" v-if="workPlaceClass == 1">
<span slot="title">已完成单</span> <span slot="title">已完成单</span>
@ -167,10 +167,10 @@
<span slot="title">工位上货</span> <span slot="title">工位上货</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=1300 @click="clickMenuItem(1300)" v-if="workPlaceClass == 2"> <!--<el-menu-item :index=1300 @click="clickMenuItem(1300)" v-if="workPlaceClass == 2">-->
<span slot="title">工位剔除</span> <!-- <span slot="title">工位剔除</span>-->
</el-menu-item> <!--</el-menu-item>-->
<el-menu-item :index=800 @click="clickMenuItem(800)" v-if="workPlaceClass == 2"> <el-menu-item :index=800 @click="clickMenuItem(800)" v-if="workPlaceClass == 2">
<span slot="title">上货推荐</span> <span slot="title">上货推荐</span>
@ -738,7 +738,9 @@ export default {
resetKeys: {}, resetKeys: {},
sendData: '', sendData: '',
//默认业务类型 为药品 sys_workplace_document //默认业务类型 为药品 sys_workplace_document
productType: 2 productType: 2,
//作业模式
jobMode : 0,
} }
}, },
methods: { methods: {
@ -1053,23 +1055,43 @@ export default {
created() { created() {
this.workPlaceClass = this.$route.query.workPlaceClass this.workPlaceClass = this.$route.query.workPlaceClass
this.productType = this.$route.query.productType this.productType = this.$route.query.productType
this.jobMode = this.$route.query.jobMode
if (this.workPlaceClass == 2) { if (this.workPlaceClass == 2) {
this.closeAllTabs() this.closeAllTabs()
if (this.productType == 2){ if (this.productType == 2){
this.editableTabsValue = 'IoCreateOrderOut' if (this.jobMode == 0){
this.menuActive = 1, this.editableTabsValue = 'IoCreateOrderOut'
this.editableTabs = [{ this.menuActive = 1,
number: 1, this.editableTabs = [{
title: '工位上货', number: 1,
name: 'IoCreateOrderOut', title: '工位上货',
component: IoCreateOrderOut, name: 'IoCreateOrderOut',
// 假设你需要传递的参数 component: IoCreateOrderOut,
componentProps: { // 假设你需要传递的参数
fromSplitType: 'out', componentProps: {
fifoSplitTag:0 fromSplitType: 'out',
fifoSplitTag:0
}
} }
} ]
] }
if (this.jobMode == 1){
this.editableTabsValue = 'IoSplitCreateOrder'
this.menuActive = 15,
this.editableTabs = [{
number: 15,
title: '拆零上货',
name: 'IoSplitCreateOrder',
component: IoSplitCreateOrder,
// 假设你需要传递的参数
componentProps: {
fromSplitType: 'out',
fifoSplitTag:1
}
}
]
}
}else if (this.productType == 1){ }else if (this.productType == 1){
this.editableTabsValue = 'DevicesIoCreateOrderOut' this.editableTabsValue = 'DevicesIoCreateOrderOut'
this.menuActive = 100, this.menuActive = 100,
@ -1103,6 +1125,7 @@ export default {
] ]
} }
this.findCurWorkPlaces(this.$route.query.workplaceId) this.findCurWorkPlaces(this.$route.query.workplaceId)
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {
this.isLinkDisabled = true this.isLinkDisabled = true

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

@ -274,14 +274,14 @@
<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 <!--<el-descriptions-item-->
label="灯组信息" <!-- label="灯组信息"-->
> <!--&gt;-->
<!--colorStyle(formData.ledNum)--> <!-- &lt;!&ndash;colorStyle(formData.ledNum)&ndash;&gt;-->
<!--<el-tag style="color:red ">灯组信息</el-tag>--> <!-- &lt;!&ndash;<el-tag style="color:red ">灯组信息</el-tag>&ndash;&gt;-->
<el-tag :type="colorStyle(formData.ledNum)">{{ledName}}</el-tag> <!-- <el-tag :type="colorStyle(formData.ledNum)">{{ledName}}</el-tag>-->
<el-tag :type="colorStyle(formData.ledNum)" v-if="formData.ledNum != null">{{ledName}}</el-tag> <!-- <el-tag :type="colorStyle(formData.ledNum)" v-if="formData.ledNum != null">{{ledName}}</el-tag>-->
</el-descriptions-item> <!--</el-descriptions-item>-->
</el-descriptions> </el-descriptions>
<div style="margin-top: 18px"> <div style="margin-top: 18px">

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

@ -237,15 +237,18 @@
</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="4" border style="margin-top: 5px">
<!--{{ formData.billNo }}--> <!--{{ formData.billNo }}-->
<el-descriptions-item label="业务单号"> <!--<el-descriptions-item label="业务单号">-->
<!--<svg ref="barcodeContainer" ></svg>--> <!--<svg ref="barcodeContainer" ></svg>-->
<div class="barcode-wrapper" > <!--<div class="barcode-wrapper" >-->
<svg ref="barcodeContainer" v-show="formData.billNo != null"></svg> <!-- <svg ref="barcodeContainer" v-show="formData.billNo != null"></svg>-->
<!--<span>{{ formData.billNo }}</span>--> <!-- &lt;!&ndash;<span>{{ formData.billNo }}</span>&ndash;&gt;-->
</div> <!--</div>-->
</el-descriptions-item>
<!--</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>
@ -257,8 +260,8 @@
<!--<svg ref="barcodeContainer"></svg>--> <!--<svg ref="barcodeContainer"></svg>-->
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue"> <el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue" v-show=" formData.billNo != null">
<el-tab-pane label="扫码详情" name="prescribeOriginPanel"> <!--<el-tab-pane label="扫码详情" name="prescribeOriginPanel">-->
<prescribeOriginPanel <prescribeOriginPanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
@ -290,7 +293,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"-->

7
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -48,7 +48,7 @@
<!--</el-button>--> <!--</el-button>-->
<el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading" <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
:disabled="orderFormData.billNo == null" :disabled="orderFormData.billNo == null && curQueueName == ''"
>取消上货 >取消上货
</el-button> </el-button>
<!--<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"--> <!--<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"-->
@ -1861,7 +1861,6 @@ export default {
this.checkSuccess = true this.checkSuccess = true
// this.workPlaceQueueCode = this.scanCode // this.workPlaceQueueCode = this.scanCode
if (this.getDMHotskeyValue(this.scanCode)) { if (this.getDMHotskeyValue(this.scanCode)) {
if (this.scanCode.includes("DMOENTER")) { if (this.scanCode.includes("DMOENTER")) {
this.submit() this.submit()
this.scanCode = '' this.scanCode = ''
@ -2089,7 +2088,7 @@ export default {
}, },
getDMHotskeyValue(str) { getDMHotskeyValue(str) {
console.log(str) console.log("解析" , str)
if (str.includes('DMHotskey')) { if (str.includes('DMHotskey')) {
try { try {
const jsonObj = JSON.parse(str) const jsonObj = JSON.parse(str)
@ -2157,6 +2156,7 @@ export default {
}) })
return true return true
}else if (str.includes("DMOENTER")) { }else if (str.includes("DMOENTER")) {
alert("hahhahahahha")
return true return true
}else if (str.includes("DMOCANCEL")) { }else if (str.includes("DMOCANCEL")) {
return true return true
@ -2506,7 +2506,6 @@ export default {
this.ws.onmessage = function (event) { this.ws.onmessage = function (event) {
let scanData = event.data // 获取扫码数据 let scanData = event.data // 获取扫码数据
let currentTime = Date.now() let currentTime = Date.now()
console.log(scanData + "33333")
// 如果时间间隔超过预设的阈值，表示这是一次新的扫码 // 如果时间间隔超过预设的阈值，表示这是一次新的扫码
if (currentTime - lastScanTime > SCAN_TIMEOUT) { if (currentTime - lastScanTime > SCAN_TIMEOUT) {
// 处理上一次完整的扫码数据 // 处理上一次完整的扫码数据

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

@ -1,115 +1,150 @@
<template> <template>
<div> <div>
<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle"> <!--<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">-->
<template v-for="(item, index) in tableHeader1"> <!-- <template v-for="(item, index) in tableHeader1">-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)" <!-- v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"-->
type="index" :label="item.columnDesc"></el-table-column> <!-- type="index" :label="item.columnDesc"></el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'selection'" <!-- v-if="item.columnType == 'selection'"-->
type="selection" <!-- type="selection"-->
:width="item.width" <!-- :width="item.width"-->
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)" <!-- :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)" <!-- v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"-->
:prop="item.columnName" <!-- :prop="item.columnName"-->
:label="item.columnDesc" <!-- :label="item.columnDesc"-->
:sortable="item.sort" <!-- :sortable="item.sort"-->
:width="item.width" <!-- :width="item.width"-->
:show-overflow-tooltip="item.tooltip" <!-- :show-overflow-tooltip="item.tooltip"-->
:key="item.columnName" <!-- :key="item.columnName"-->
> <!-- >-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <!-- <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)" <!-- v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"-->
:prop="item.columnName" <!-- :prop="item.columnName"-->
:label="item.columnDesc" <!-- :label="item.columnDesc"-->
:sortable="item.sort" <!-- :sortable="item.sort"-->
:width="item.width" <!-- :width="item.width"-->
:show-overflow-tooltip="item.tooltip" <!-- :show-overflow-tooltip="item.tooltip"-->
:key="item.columnName" <!-- :key="item.columnName"-->
> <!-- >-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ <!-- <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{-->
item.lableRuleObj[scope.row[item.columnName]] <!-- item.lableRuleObj[scope.row[item.columnName]]-->
}}</span> <!-- }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)" <!-- v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"-->
:prop="item.columnName" <!-- :prop="item.columnName"-->
:label="item.columnDesc" <!-- :label="item.columnDesc"-->
:sortable="item.sort" <!-- :sortable="item.sort"-->
:width="item.width" <!-- :width="item.width"-->
:show-overflow-tooltip="item.tooltip" <!-- :show-overflow-tooltip="item.tooltip"-->
:key="item.columnName" <!-- :key="item.columnName"-->
> <!-- >-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-tag <!-- <el-tag-->
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <!-- :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">-->
<span>{{ <!-- <span>{{-->
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName] <!-- item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]-->
}}</span> <!-- }}</span>-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)" <!-- v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
:prop="item.columnName" <!-- :prop="item.columnName"-->
:label="item.columnDesc" <!-- :label="item.columnDesc"-->
:width="item.width" <!-- :width="item.width"-->
:key="item.columnName" <!-- :key="item.columnName"-->
fixed="right" <!-- fixed="right"-->
> <!-- >-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj" <!-- <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
:type="buttonItem.type" <!-- :type="buttonItem.type"-->
:size="buttonItem.size" <!-- :size="buttonItem.size"-->
:style="buttonItem.style" <!-- :style="buttonItem.style"-->
:key="buttonItem" <!-- :key="buttonItem"-->
v-if="executeEval(scope.row,buttonItem.hasPermi,true)" <!-- v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)" <!-- :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)" <!-- @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
>{{ buttonItem.name }} <!-- >{{ buttonItem.name }}-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'text' && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)" <!-- v-if="item.columnType == 'text' && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"-->
:prop="item.columnName" <!-- :prop="item.columnName"-->
:label="item.columnDesc" <!-- :label="item.columnDesc"-->
:sortable="item.sort" <!-- :sortable="item.sort"-->
:width="item.width" <!-- :width="item.width"-->
:show-overflow-tooltip="item.tooltip" <!-- :show-overflow-tooltip="item.tooltip"-->
:key="item.columnName" <!-- :key="item.columnName"-->
> <!-- >-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ <!-- <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{-->
scope.row[item.columnName] <!-- scope.row[item.columnName]-->
}}</span> <!-- }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)" <!-- v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"-->
:prop="item.columnName" <!-- :prop="item.columnName"-->
:label="item.columnDesc" <!-- :label="item.columnDesc"-->
:sortable="item.sort" <!-- :sortable="item.sort"-->
:width="item.width" <!-- :width="item.width"-->
:show-overflow-tooltip="item.tooltip" <!-- :show-overflow-tooltip="item.tooltip"-->
:key="item.columnName" <!-- :key="item.columnName"-->
> <!-- >-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ <!-- <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{-->
convertDateFun(scope.row[item.columnName]) <!-- convertDateFun(scope.row[item.columnName])-->
}}</span> <!-- }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</template> <!-- </template>-->
<!--</el-table>-->
<el-table :data="preDetailList" highlight-current-row="true" border ref="multipleTable" :row-style="rowStyle">
<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="spec" width="100"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="80"></el-table-column>
<el-table-column label="扫码数量" prop="scanActCount" width="80">
<template v-slot="scope">
<div :style="{ fontSize: '26px', }">{{ scope.row.scanActCount }}</div>
</template>
</el-table-column>
<el-table-column label="单据数量" prop="count" width="80">
<template v-slot="scope">
<div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
</template>
</el-table-column>
<el-table-column label="工位库存" prop="tempWorkPlaceCount" width="80">
<template v-slot="scope">
<div :style="{ fontSize: '26px' }">{{ scope.row.tempWorkPlaceCount }}</div>
</template>
</el-table-column>
<el-table-column label="拆零数量" prop="tempSplitCount" width="80">
<template v-slot="scope">
<div :style="{ fontSize: '26px' }">{{ scope.row.tempSplitCount }}</div>
</template>
</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">
<template slot-scope="scope">
<el-button type="primary" icon="el-icon-document" @click="scanDetail(scope.row)" >扫码明细</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -285,9 +320,9 @@ export default {
}, },
scanDetail(_this, row) { scanDetail( row) {
_this.bizId = row.id; this.bizId = row.id;
_this.scanDetailVisible = true; this.scanDetailVisible = true;
}, },
closeScanDialog() { closeScanDialog() {
@ -297,7 +332,8 @@ export default {
rowStyle({row, rowIndex}) { rowStyle({row, rowIndex}) {
let rowBackground = {}; let rowBackground = {};
rowBackground.fontSize = '16px';
rowBackground.height = "50px";
if (row.scanActCount < row.count) { if (row.scanActCount < row.count) {
rowBackground.color = '#F56C6C'; rowBackground.color = '#F56C6C';
} }
@ -307,7 +343,6 @@ export default {
if (row.scanActCount >= row.count) { if (row.scanActCount >= row.count) {
rowBackground.color = '#56a717'; rowBackground.color = '#56a717';
} }
rowBackground.height = "38px"
return rowBackground; return rowBackground;
}, },

2
src/views/collect/fieldOperation.vue
Unescape Escape View File

@ -133,7 +133,7 @@ export default {
getUserWorkByWorkplaceCode(query).then(res => { getUserWorkByWorkplaceCode(query).then(res => {
if (res.code == 20000){ if (res.code == 20000){
let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId +`&workPlaceClass=`+ this.stationList[index].workPlaceClass let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId +`&workPlaceClass=`+ this.stationList[index].workPlaceClass
+`&productType=`+ this.stationList[index].productType +`&productType=`+ this.stationList[index].productType + `&jobMode=` + this.stationList[index].jobMode
// this.$router.push( workplaceId) // this.$router.push( workplaceId)
window.open(url, '_blank'); window.open(url, '_blank');
}else { }else {

Write Preview
Loading…
Cancel
Save