|
|
|
@ -142,14 +142,20 @@
|
|
|
|
|
<el-table-column label="分配条件1" prop="assignmentTerms1" show-overflow-tooltip width="160"></el-table-column>
|
|
|
|
|
<el-table-column label="分配条件2" prop="assignmentTerms2" show-overflow-tooltip width="160"></el-table-column>
|
|
|
|
|
<el-table-column label="备注" prop="remark" show-overflow-tooltip width="160"></el-table-column>
|
|
|
|
|
<el-table-column label="操作" fixed="right" width="140">
|
|
|
|
|
<el-table-column label="操作" fixed="right" width="260">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button
|
|
|
|
|
type="text"
|
|
|
|
|
size="small"
|
|
|
|
|
@click.native.stop="removeRelId(scope.row)"
|
|
|
|
|
@click.native.stop="bingLed(scope.row)"
|
|
|
|
|
>绑定灯组
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
type="text"
|
|
|
|
|
size="small"
|
|
|
|
|
@click.native.stop="removeMac(scope.row)"
|
|
|
|
|
:disabled="!scope.row.nameCode"
|
|
|
|
|
>解除绑定
|
|
|
|
|
>解绑灯组
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
type="text"
|
|
|
|
@ -158,6 +164,13 @@
|
|
|
|
|
:disabled="scope.row.nameCode"
|
|
|
|
|
>绑定产品
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
type="text"
|
|
|
|
|
size="small"
|
|
|
|
|
@click.native.stop="removeRelId(scope.row)"
|
|
|
|
|
:disabled="!scope.row.nameCode"
|
|
|
|
|
>解除绑定
|
|
|
|
|
</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
@ -212,6 +225,35 @@
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<el-form-item prop="code" label="灯组标签:" class="query-form-item">
|
|
|
|
|
<el-input
|
|
|
|
|
id="inputer1"
|
|
|
|
|
@focus="getInputFocus($event)"
|
|
|
|
|
@keypress.enter.native="enterKey3($event)"
|
|
|
|
|
ref="inputRef1"
|
|
|
|
|
type="tel"
|
|
|
|
|
placeholder="请点击输入框进行扫描灯组标签"
|
|
|
|
|
v-model="addBindData.macCode"
|
|
|
|
|
style="width: 80%"
|
|
|
|
|
:disabled="!addBindData.macCodeFlag"
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<el-form-item prop="udiCode" label="" class="query-form-item">
|
|
|
|
|
<el-descriptions class="margin-top" title="" :column="3" border style="width: 80%">
|
|
|
|
|
<el-descriptions-item label="灯组标签">{{ sysWorkplaceQueue.code }}</el-descriptions-item>
|
|
|
|
|
<!--<el-descriptions-item label="货架名称">{{ sysWorkplaceQueue.name }}</el-descriptions-item>-->
|
|
|
|
|
<el-descriptions-item label="备注">{{ sysWorkplaceQueue.remark }}</el-descriptions-item>
|
|
|
|
|
</el-descriptions>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="24" style="margin-top: 30px">
|
|
|
|
|
<el-form-item prop="udiCode" label="产品编码:" class="query-form-item">
|
|
|
|
|
<el-input
|
|
|
|
@ -307,8 +349,8 @@
|
|
|
|
|
@close=""
|
|
|
|
|
>
|
|
|
|
|
<bingdLedGroupDialog
|
|
|
|
|
:product="product"
|
|
|
|
|
@bindLed="bingLedGroup"
|
|
|
|
|
:queueData="queueData"
|
|
|
|
|
:closeBindLed="closeBindLed"
|
|
|
|
|
>
|
|
|
|
|
</bingdLedGroupDialog>
|
|
|
|
|
|
|
|
|
@ -325,7 +367,7 @@ import {
|
|
|
|
|
getInfoByCode,
|
|
|
|
|
getProductByCode,
|
|
|
|
|
bind,
|
|
|
|
|
removeProduct
|
|
|
|
|
removeProduct, removeLed
|
|
|
|
|
} from '@/api/basic/workPlace/SysWorkplaceQueue'
|
|
|
|
|
import { executeFuc, getHead } from '@/utils/customConfig'
|
|
|
|
|
import selectDrugDialog from "./selectDrugDialog"
|
|
|
|
@ -380,7 +422,9 @@ export default {
|
|
|
|
|
relId: null,
|
|
|
|
|
codeFlag: false,
|
|
|
|
|
udiCode: null,
|
|
|
|
|
udiCodeFlag: false
|
|
|
|
|
udiCodeFlag: false,
|
|
|
|
|
macCode:null,
|
|
|
|
|
macCodeFlag: false
|
|
|
|
|
},
|
|
|
|
|
dialogTableVisible: false,
|
|
|
|
|
radio: 1,
|
|
|
|
@ -456,6 +500,7 @@ export default {
|
|
|
|
|
3: '已退回'
|
|
|
|
|
},
|
|
|
|
|
addBindLedVisible: false,
|
|
|
|
|
queueData: null,
|
|
|
|
|
ledData:{}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
@ -579,9 +624,6 @@ export default {
|
|
|
|
|
if (this.addBindData.udiCode == null) {
|
|
|
|
|
return this.$message.error('请添加产品!')
|
|
|
|
|
}
|
|
|
|
|
if (this.ledData.id == null){
|
|
|
|
|
return this.$message.error('请绑定灯组!')
|
|
|
|
|
}
|
|
|
|
|
this.addBindData.relId = this.product.relId
|
|
|
|
|
bind(this.addBindData).then(
|
|
|
|
|
(response) => {
|
|
|
|
@ -671,7 +713,7 @@ export default {
|
|
|
|
|
this.codeDetailList = []
|
|
|
|
|
this.codeTotal = 0
|
|
|
|
|
},
|
|
|
|
|
//获取订单列表
|
|
|
|
|
|
|
|
|
|
getList() {
|
|
|
|
|
this.loading = true
|
|
|
|
|
getSysWorkplaceLayerList(this.codeQuery)
|
|
|
|
@ -868,15 +910,36 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
bingLed(){
|
|
|
|
|
if (isBlank(this.product.nameCode)){
|
|
|
|
|
return this.$message.error("请先录入产品")
|
|
|
|
|
}
|
|
|
|
|
bingLed(row){
|
|
|
|
|
this.queueData = row
|
|
|
|
|
this.addBindLedVisible = true
|
|
|
|
|
},
|
|
|
|
|
bingLedGroup(row){
|
|
|
|
|
this.ledData = row
|
|
|
|
|
removeMac(row){
|
|
|
|
|
let query = {
|
|
|
|
|
code: row.code,
|
|
|
|
|
mac: row.mac
|
|
|
|
|
}
|
|
|
|
|
this.$confirm('此操作将解绑该槽位与灯组, 是否继续?', '提示', {
|
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
|
type: 'warning'
|
|
|
|
|
}).then(() => {
|
|
|
|
|
removeLed(query).then(res => {
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
this.$message.success('解绑成功')
|
|
|
|
|
this.getCodeDetailList()
|
|
|
|
|
} else {
|
|
|
|
|
this.$message.error('解绑失败')
|
|
|
|
|
this.getCodeDetailList()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
closeBindLed(){
|
|
|
|
|
// this.ledData = row
|
|
|
|
|
this.addBindLedVisible = false
|
|
|
|
|
this.getCodeDetailList()
|
|
|
|
|
// console.log("hagaggaga",row)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|